[SCM] Debian Live initramfs hook branch, master, updated. 1.156.1-1-3-g3d61748

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 3d6174837935d741a8e8a58cf6b9cb3b5c7b58f8
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 5 10:59:21 2009 +0100

    Improving check in 21xdriver when we don't do anything.

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index 29ae78e..ef17bff 100755
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -20,12 +20,7 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOXAUTOCONFIG}" ]
-then
-	exit 0
-fi
-
-if [ ! -x /root/usr/bin/X ]
+if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -n "${XDRIVER}" ]
 then
 	exit 0
 fi
@@ -38,22 +33,19 @@ log_begin_msg "Configuring X video driver"
 
 . /live.vars
 
-if [ -n "$XDRIVER" ]
-then
-	mount -o bind /sys /root/sys
-	mount -o bind /proc /root/proc
-	mount -o bind /dev /root/dev
+mount -o bind /sys /root/sys
+mount -o bind /proc /root/proc
+mount -o bind /dev /root/dev
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/autodetect_video_card false
 set xserver-xorg/config/device/driver ${XDRIVER}
 EOF
 
-	chroot /root dexconf
+chroot /root dexconf
 
-	umount /root/sys
-	umount /root/proc
-	umount /root/dev
-fi
+umount /root/sys
+umount /root/proc
+umount /root/dev
 
 log_end_msg

-- 
Debian Live initramfs hook