diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-11-30 15:17:33 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-11-30 15:22:05 +0100 |
| commit | d08aabb614dc402433efdab6678894387df48220 (patch) | |
| tree | 9f2c1a7584d1a1f9cd23f82c817558b1ad2cd575 /scripts/build/chroot_hacks | |
| parent | d3062466979815f084593271af2857bf0bd2e0ae (diff) | |
| download | vyos-live-build-d08aabb614dc402433efdab6678894387df48220.tar.gz vyos-live-build-d08aabb614dc402433efdab6678894387df48220.zip | |
Dropping support for squeeze and squeeze-based distributions.
Diffstat (limited to 'scripts/build/chroot_hacks')
| -rwxr-xr-x | scripts/build/chroot_hacks | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks index f0e885b08..f7d48ead1 100755 --- a/scripts/build/chroot_hacks +++ b/scripts/build/chroot_hacks @@ -38,22 +38,6 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -case "${LB_PARENT_DISTRIBUTION}" in - squeeze) - if echo "${LB_TASKS}" | grep -qs lxde || - echo "${LB_TASKS}" | grep -qs xfce - then - GDM="gdm" - else - GDM="gdm3" - fi - ;; - - *) - GDM="gdm3" - ;; -esac - # Handling default desktop configuration case "${LB_MODE}" in debian*) @@ -76,11 +60,11 @@ do if [ -z "$(echo ${LB_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" @@ -111,11 +95,11 @@ do if [ -z "$(echo ${LB_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" @@ -127,11 +111,11 @@ do if [ -z "$(echo ${LB_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" |