|
|
|
@ -122,18 +122,21 @@ mainmenu() {
|
|
|
|
|
else
|
|
|
|
|
export wm_bin="${wmbinlist[${wm}]}"
|
|
|
|
|
|
|
|
|
|
# Fix for gnome-session (I hope)
|
|
|
|
|
if [[ ${wm_bin} == "gnome-session" ]]; then
|
|
|
|
|
export wm_bin="dbus-launch gnome-session"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Start X
|
|
|
|
|
if [[ ${loginshell} == "yes" ]]; then
|
|
|
|
|
if [[ ${wm_bin} == "gnome-session" ]]; then
|
|
|
|
|
exec bash --login -c startx /usr/share/cdm/xinitrc -- :${display} &> /dev/null &
|
|
|
|
|
else
|
|
|
|
|
exec ck-launch-session bash --login -c startx /usr/share/cdm/xinitrc -- :${display} &> /dev/null &
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
if [[ ${wm_bin} == "gnome-session" ]]; then
|
|
|
|
|
exec startx /usr/share/cdm/xinitrc -- :${display} &> /dev/null &
|
|
|
|
|
else
|
|
|
|
|
exec ck-launch-session startx /usr/share/cdm/xinitrc -- :${display} &> /dev/null &
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
clear
|
|
|
|
|
exit 0
|
|
|
|
|