[SCM] debian-live branch, master, updated. debian/1.136.3-1-23-g08d5478

[Chris Lamb]

The following commit has been merged in the master branch:
commit ed294832175e7686db69c1abe98554286ee8aecc
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Aug 9 08:47:11 2008 +0100

    Hide "overwriting possibly-customised configuration file" in X.org setup output.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 39a0aa4..2a24ab5 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -77,7 +77,8 @@ ${setmodel}
 ${setoptions}
 EOF
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>/dev/null
+DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \
+	grep -v "overwriting possibly-customised configuration file"
 umount /root/sys
 umount /root/proc
 umount /root/dev

-- 
debian-live