summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-02 23:56:25 +0200
committerDaniel Baumann <daniel@debian.org>2010-09-02 23:56:25 +0200
commitdd2c7afa0f5590aa78c14073bfa3cda271da59c0 (patch)
tree8934726f8439bd0e2e4ca31d3ef0c0a6a3627e4a /scripts
parent6f8c7e279ca10c7c243d9ee1fab416e11e2cb5f9 (diff)
downloadvyos-live-build-dd2c7afa0f5590aa78c14073bfa3cda271da59c0.tar.gz
vyos-live-build-dd2c7afa0f5590aa78c14073bfa3cda271da59c0.zip
Updating gdm handling for lxde.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/chroot_hacks25
1 files changed, 15 insertions, 10 deletions
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 1fd3aa822..4417e332a 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -38,19 +38,24 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Handling default desktop configuration
-for TASK in ${LH_TASKS}
-do
- case "${LH_DISTRIBUTION}" in
- lenny)
+case "${LH_DISTRIBUTION}" in
+ squeeze|sid)
+ if echo "${LH_TASKS}" | grep -qs lxde
+ then
GDM="gdm"
- ;;
-
- *)
+ else
GDM="gdm3"
- ;;
- esac
+ fi
+ ;;
+
+ *)
+ GDM="gdm"
+ ;;
+esac
+# Handling default desktop configuration
+for TASK in ${LH_TASKS}
+do
case "${TASK}" in
gnome-desktop)
# gnome is the only desktop environment in this image