diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-07-08 18:41:54 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-07-08 18:41:54 +0200 |
| commit | 3a44d9acbd0945018138ebb3548054985ee15e22 (patch) | |
| tree | feee14f85b05441dc76b1e8c6b1b20fc7abecdff | |
| parent | ecd8dca2ba65b351f9737a2a02cc2779b1f86240 (diff) | |
| download | vyos-live-build-3a44d9acbd0945018138ebb3548054985ee15e22.tar.gz vyos-live-build-3a44d9acbd0945018138ebb3548054985ee15e22.zip | |
Correct gdm/gdm3 handling, prefere gdm for squeeze as before and use gdm3 for everything else.
| -rw-r--r-- | package-lists/lxde | 5 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_hacks | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/package-lists/lxde b/package-lists/lxde index e7c869fa0..dc20b992b 100644 --- a/package-lists/lxde +++ b/package-lists/lxde @@ -3,6 +3,11 @@ #include <standard-x11> lxde +#if DISTRIBUTION squeeze +gdm +#endif +#nif DISTRIBUTION squeeze gdm3 +#endif network-manager-gnome desktop-base diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index 373ba1808..eed0294d8 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -39,8 +39,9 @@ Check_lockfile .lock Create_lockfile .lock case "${LB_PARENT_DISTRIBUTION}" in - squeeze|wheezy|sid) - if echo "${LB_TASKS}" | grep -qs xfce + squeeze) + if echo "${LB_TASKS}" | grep -qs lxde || + echo "${LB_TASKS}" | grep -qs xfce then GDM="gdm" else @@ -49,7 +50,7 @@ case "${LB_PARENT_DISTRIBUTION}" in ;; *) - GDM="gdm" + GDM="gdm3" ;; esac |