diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-07-08 02:14:09 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:14 +0100 |
| commit | 0cff2cbe7004d4582e501aeb413dedf5c13de58d (patch) | |
| tree | 4bfd78249bd7eee0f41d2aaf766124d62583cbd8 | |
| parent | e76cdfd524be69581ee6fdda38eef5a843cdd73a (diff) | |
| download | live-build-0cff2cbe7004d4582e501aeb413dedf5c13de58d.zip live-build-0cff2cbe7004d4582e501aeb413dedf5c13de58d.tar.gz | |
Updating hacks to cope with gdm and gdm3 packages.
| -rwxr-xr-x | helpers/chroot_hacks | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/helpers/chroot_hacks b/helpers/chroot_hacks index dfad9d1..22f03d3 100755 --- a/helpers/chroot_hacks +++ b/helpers/chroot_hacks @@ -40,17 +40,27 @@ Create_lockfile .lock # Handling default desktop configuration for TASK in ${LH_TASKS} do + case "${LH_DISTRIBUTION}" in + lenny) + GDM="gdm" + ;; + + *) + GDM="gdm3" + ;; + esac + case "${TASK}" in gnome-desktop) # gnome is the only desktop environment in this image if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ] then # set display manager - echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed + echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed Chroot chroot "debconf-set-selections /root/preseed" rm -f chroot/root/preseed - Chroot chroot "dpkg-reconfigure gdm" - echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager + Chroot chroot "dpkg-reconfigure ${GDM}" + echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager # set session manager Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session" @@ -81,11 +91,11 @@ do if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ] then # set display manager - echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed + echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed Chroot chroot "debconf-set-selections /root/preseed" rm -f chroot/root/preseed - Chroot chroot "dpkg-reconfigure gdm" - echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager + Chroot chroot "dpkg-reconfigure ${GDM}" + echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager # set session manager Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde" @@ -97,11 +107,11 @@ do if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ] then # set display manager - echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed + echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed Chroot chroot "debconf-set-selections /root/preseed" rm -f chroot/root/preseed - Chroot chroot "dpkg-reconfigure gdm" - echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager + Chroot chroot "dpkg-reconfigure ${GDM}" + echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager # set session manager Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session" |