[SCM] debian-live branch, master, updated. 1.136.3-1-32-g3f5a329

[Chris Lamb]

The following commit has been merged in the master branch:
commit 005ead7e6f1fdcfd02c078066e39df7a088d3c64
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Aug 12 01:13:25 2008 +0100

    Re-order some commands so we don't call log_begin_msg without calling log_end_msg.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index ae653fd..bb9902e 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -20,17 +20,17 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOXAUTOLOGIN}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Setting up automatic login"
 
 # live-initramfs script
 
-if [ -n "${NOXAUTOLOGIN}" ]
-then
-	exit 0
-fi
-
 # chroot needed to handle symlinks correctly
 if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]
 then
diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 4a80b21..c06a505 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -27,8 +27,6 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring X"
-
 # live-initramfs script
 
 if [ "${TERM_TYPE}" = "serial" ]
@@ -48,6 +46,8 @@ then
 	exit 0
 fi
 
+log_begin_msg "Configuring X"
+
 locale=en_US.UTF-8
 
 mount -n -o bind /sys /root/sys

-- 
debian-live