[SCM] live-config branch, debian, updated. debian/2.0.2-1-4-gc08b07c
Daniel Baumann
daniel at debian.org
Thu Sep 2 16:40:04 UTC 2010
The following commit has been merged in the debian branch:
commit 8ba648a4bb7712b745d96c8906469eb09c091689
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 10 04:16:53 2010 +0200
Only run x-session-manager parts when x-session-manager is set.
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index 0afdd79..57b72b7 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -45,15 +45,18 @@ xserver-xorg/config/inputdevice/keyboard/variant
echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/options string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
fi
- case "${LIVE_X_SESSION_MANAGER}" in
- none)
- rm -f /etc/X11/default-display-manager
- ;;
-
- *)
- update-alternatives --quiet --set x-session-manager "${LIVE_X_SESSION_MANAGER}"
- ;;
- esac
+ if [ -n "${LIVE_X_SESSION_MANAGER}" ]
+ then
+ case "${LIVE_X_SESSION_MANAGER}" in
+ none)
+ rm -f /etc/X11/default-display-manager
+ ;;
+
+ *)
+ update-alternatives --quiet --set x-session-manager "${LIVE_X_SESSION_MANAGER}"
+ ;;
+ esac
+ fi
if [ -n "${LIVE_XORG_DRIVER}" ]
then
--
live-config
More information about the debian-live-changes
mailing list