root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:udeved/manjaro-tools

Browse source
This commit is contained in:
udeved 2014-12-18 21:28:13 +01:00
commit c36242b966
2 changed files with 40 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/util-iso.sh
View file

@ -95,6 +95,9 @@ configure_accountsservice(){
msg2 "Configuring AcooutsService ..."
if [ -d "$1/var/lib/AccountsService/users" ] ; then
echo "[User]" > $1/var/lib/AccountsService/users/$2
if [ -e "$1/usr/bin/openbox-session" ] ; then
echo "XSession=openbox" >> $1/var/lib/AccountsService/users/$2
fi
if [ -e "$1/usr/bin/startxfce4" ] ; then
echo "XSession=xfce" >> $1/var/lib/AccountsService/users/$2
fi
@ -107,9 +110,6 @@ configure_accountsservice(){
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
echo "XSession=enlightenment" >> $1/var/lib/AccountsService/users/$2
fi
if [ -e "$1/usr/bin/openbox-session" ] ; then
echo "XSession=openbox" >> $1/var/lib/AccountsService/users/$2
fi
if [ -e "$1/usr/bin/startlxde" ] ; then
echo "XSession=LXDE" >> $1/var/lib/AccountsService/users/$2
fi
@ -132,6 +132,9 @@ configure_displaymanager(){
case ${displaymanager} in
'lightdm')
if [ -e "$1/usr/bin/openbox-session" ] ; then
sed -i -e 's/^.*user-session=.*/user-session=openbox/' $1/etc/lightdm/lightdm.conf
fi
if [ -e "$1/usr/bin/startxfce4" ] ; then
sed -i -e 's/^.*user-session=.*/user-session=xfce/' $1/etc/lightdm/lightdm.conf
fi
@ -144,9 +147,6 @@ configure_displaymanager(){
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
sed -i -e 's/^.*user-session=.*/user-session=enlightenment/' $1/etc/lightdm/lightdm.conf
fi
if [ -e "$1/usr/bin/openbox-session" ] ; then
sed -i -e 's/^.*user-session=.*/user-session=openbox/' $1/etc/lightdm/lightdm.conf
fi
if [ -e "$1/usr/bin/startlxde" ] ; then
sed -i -e 's/^.*user-session=.*/user-session=LXDE/' $1/etc/lightdm/lightdm.conf
fi
@ -216,6 +216,9 @@ configure_displaymanager(){
;;
'lxdm')
sed -i -e "s/^.*autologin=.*/autologin=${username}/" $1/etc/lxdm/lxdm.conf
if [ -e "$1/usr/bin/openbox-session" ] ; then
sed -i -e 's|^.*session=.*|session=/usr/bin/openbox-session|' $1/etc/lxdm/lxdm.conf
fi
if [ -e "$1/usr/bin/startxfce4" ] ; then
sed -i -e 's|^.*session=.*|session=/usr/bin/startxfce4|' $1/etc/lxdm/lxdm.conf
fi
@ -228,9 +231,6 @@ configure_displaymanager(){
if [ -e "$1/usr/bin/enlightenment_start" ] ; then
sed -i -e 's|^.*session=.*|session=/usr/bin/enlightenment_start|' $1/etc/lxdm/lxdm.conf
fi
if [ -e "$1/usr/bin/openbox-session" ] ; then
sed -i -e 's|^.*session=.*|session=/usr/bin/openbox-session|' $1/etc/lxdm/lxdm.conf
fi
if [ -e "$1/usr/bin/startlxde" ] ; then
sed -i -e 's|^.*session=.*|session=/usr/bin/lxsession|' $1/etc/lxdm/lxdm.conf
fi

102
lib/util-livecd.sh
View file

@ -295,18 +295,11 @@ configure_alsa_live(){
$alsa_amixer -c 0 sset "Audigy Analog/Digital Output Jack" off &>/dev/null
}
configure_live_installer_live(){
if [ -e "/etc/live-installer/install.conf" ] ; then
_conf_file="/etc/live-installer/install.conf"
fi
}
configure_live_image () {
_conf_file="$1" # Configuration file passed as first argument
configure_calamares_live(){
if [ -e "/usr/share/calamares/settings.conf" ] ; then
echo "configure calamares" >> /tmp/livecd.log
_conf_file="/usr/share/calamares/modules/unpackfs.conf"
if [ -e "$_conf_file" ] ; then
sed -i "s|_root-image_|/bootmnt/${install_dir}/_ARCH_/root-image.sqfs|g" $_conf_file
sed -i "s|_kernel_|$manjaro_kernel|g" "/usr/share/calamares/modules/initcpio.conf"
if [ -e "/bootmnt/${install_dir}/${arch}/xfce-image.sqfs" ] ; then
sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/xfce-image.sqfs|g" $_conf_file
@ -349,68 +342,35 @@ configure_calamares_live(){
fi
}
configure_thus_live(){
if [ -e "/etc/thus.conf" ] ; then
echo "configure thus" >> /tmp/livecd.log
_conf_file="/etc/thus.conf"
fi
if [ -e "$_conf_file" ] ; then
sed -i "s|_root-image_|/bootmnt/${install_dir}/_ARCH_/root-image.sqfs|g" $_conf_file
sed -i "s|_kernel_|$manjaro_kernel|g" $_conf_file
release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
sed -i "s|_version_|$release|g" $_conf_file
if [ -e "/bootmnt/${install_dir}/${arch}/xfce-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/xfce-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro XFCE Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/gnome-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/gnome-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro Gnome Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/cinnamon-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/cinnamon-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro Cinnamon Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/openbox-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/openbox-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro Openbox Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/mate-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/mate-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro MATE Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/kde-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/kde-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro KDE Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/lxde-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/lxde-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro LXDE Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/lxqt-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/lxqt-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro LXQt Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/enlightenment-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/enlightenment-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro Enlightenment Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/pekwm-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/pekwm-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro PekWM Edition|g" $_conf_file
fi
if [ -e "/bootmnt/${install_dir}/${arch}/custom-image.sqfs" ] ; then
sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/custom-image.sqfs|g" $_conf_file
sed -i "s|_title_|Manjaro Custom Edition|g" $_conf_file
fi
if [ "${arch}" == "i686" ] ; then
sed -i "s|_ARCH_|i686|g" $_conf_file
else
sed -i "s|_ARCH_|x86_64|g" $_conf_file
fi
configure_live_installer_live(){
if [ -e "/etc/live-installer/install.conf" ] ; then
echo "configure live-installer" >> /tmp/livecd.log
conf_file="/etc/live-installer/install.conf"
fi
release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
sed -i "s|_version_|$release|g" $conf_file
sed -i "s|_kernel_|$manjaro_kernel|g" $conf_file
configure_live_image $conf_file
}
configure_thus_live(){
if [ -e "/etc/thus.conf" ] ; then
echo "configure thus" >> /tmp/livecd.log
conf_file="/etc/thus.conf"
fi
release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
sed -i "s|_version_|$release|g" $conf_file
sed -i "s|_kernel_|$manjaro_kernel|g" $conf_file
configure_live_image $conf_file
}
configure_calamares_live(){
if [ -e "/usr/share/calamares/settings.conf" ] ; then
echo "configure calamares" >> /tmp/livecd.log
conf_file="/usr/share/calamares/modules/unpackfs.conf"
fi
sed -i "s|_kernel_|$manjaro_kernel|g" "/usr/share/calamares/modules/initcpio.conf"
configure_live_image $conf_file
}
fix_kdm(){