This adds the option for an LXDE desktop to fll-desktop. When lxde is installed, it can be used with an desktop=lxde boot option.
* fll-desktop
- add LXDE desktop
- reordering entries
Code:
Index: fll-live-initscripts.fll-desktop.init
===================================================================
--- fll-live-initscripts.fll-desktop.init (revision 20314)
+++ fll-live-initscripts.fll-desktop.init (working copy)
@@ -69,7 +69,10 @@
fi
if [ -z "${DESKTOP}" ]; then
- [ -x "/usr/bin/startfluxbox" ] && DESKTOP="fluxbox" # fourth choice
+ [ -x "/usr/bin/icewm" ] && DESKTOP="icewm" # sixth choice
+ [ -x "/usr/bin/startfluxbox" ] && DESKTOP="fluxbox" # fifth choice
+ [ -x "/usr/bin/startlxde" ] && [ -x "/usr/bin/openbox" ] && \
+ DESKTOP="lxde" # fourth choice
[ -x "/usr/bin/xfwm4" ] && DESKTOP="xfce4" # third choice
[ -x "/usr/bin/metacity" ] && DESKTOP="gnome" # second choice
[ -x "/usr/bin/kwin" ] && DESKTOP="kde" # first choice, if installed and desktop= is empty
@@ -86,21 +89,24 @@
log_daemon_msg "${NAME}"
case "${DESKTOP}" in
- kde)
- WM="/usr/bin/kwin"
+ flux*)
+ WM="/usr/bin/startfluxbox"
;;
gnome)
WM="/usr/bin/metacity"
;;
- flux*)
- WM="/usr/bin/startfluxbox"
+ icewm)
+ WM="/usr/bin/icewm"
;;
+ kde)
+ WM="/usr/bin/kwin"
+ ;;
+ lxde)
+ WM="/usr/bin/openbox"
+ ;;
xfce*)
WM="/usr/bin/xfwm4"
;;
- icewm)
- WM="/usr/bin/icewm"
- ;;
*)
log_action_msg " desktop '${DESKTOP}' is not available"
log_end_msg 0
@@ -125,6 +131,9 @@
"/usr/bin/icewm")
XSESSION="IceWM"
;;
+ "/usr/bin/openbox")
+ XSESSION="LXDE"
+ ;;
esac
log_action_begin_msg " setting up window manager '${WM}'"
@@ -152,7 +161,7 @@
echo "Error: argument '${1}' not supported" >&2
exit 3
;;
- kde|gnome|flux*|xfce*|icewm)
+ kde|gnome|flux*|xfce*|icewm|lxde)
DESKTOP="${1}"
do_start
;;
|
