[SCM] live-config branch, debian, updated. debian/2.0.2-1-4-gc08b07c
Daniel Baumann
daniel at debian.org
Thu Sep 2 16:40:05 UTC 2010
The following commit has been merged in the debian branch:
commit 797384cd93fe38d77b1cb2fe775f2e34ce43a9a1
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Aug 11 15:48:19 2010 +0200
Using dpkg-reconfigure instead of dexconf in xserver-xorg script (Closes: #592510).
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index ff56cfd..8493925 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -75,12 +75,10 @@ Configure_xserver_xorg ()
debconf-set-selections < /tmp/debconf.live
rm -f /tmp/debconf.live
- dexconf
-
-# dpkg-reconfigure -f non-interactive -p critical \
-# xserver-xorg 2>&1 \
-# | grep -v "overwriting possibly-customised configuration" \
-# | grep -v "file; backup in /etc/X11/xorg.conf"
+ dpkg-reconfigure -f non-interactive -p critical \
+ xserver-xorg 2>&1 \
+ | grep -v "overwriting possibly-customised configuration" \
+ | grep -v "file; backup in /etc/X11/xorg.conf" || true
# Creating state file
touch /var/lib/live/config/xserver-xorg
--
live-config
More information about the debian-live-changes
mailing list