[SCM] live-helper branch, debian-next, updated. debian/2.0_a7-1-19-g4400785
Daniel Baumann
daniel at debian.org
Sun Feb 21 13:04:44 UTC 2010
The following commit has been merged in the debian-next branch:
commit 4400785907b8928f7316b0658962c91855030c1b
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Feb 21 14:00:39 2010 +0100
Correcting desktop hacks.
diff --git a/helpers/chroot_hacks b/helpers/chroot_hacks
index eac7d13..98e6b5b 100755
--- a/helpers/chroot_hacks
+++ b/helpers/chroot_hacks
@@ -43,7 +43,7 @@ do
case "${TASKS}" in
gnome-desktop)
# gnome is the only desktop environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e '| desktop ||' | grep desktop)" ]
+ 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
@@ -59,7 +59,7 @@ do
kde-desktop)
# kde is the only desktop-environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e '| desktop ||' | grep desktop)" ]
+ if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e 's| desktop ||' | grep desktop)" ]
then
# set display manager
echo "kdm shared/default-x-display-manager select kdm" > chroot/root/preseed
@@ -75,7 +75,7 @@ do
lxde-desktop)
# lxde is the only desktop environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e '| desktop ||' | grep desktop)" ]
+ 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
@@ -91,7 +91,7 @@ do
xfce-desktop)
# xfce is the only desktop environment in this image
- if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e '| desktop ||' | grep desktop)" ]
+ 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
--
live-helper
More information about the debian-live-changes
mailing list