Re-order some commands so we don't call log_begin_msg without calling…

… log_end_msg. Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
grml · Aug 12, 2008 · 67fa1c4 · 67fa1c4
1 parent bb55191
commit 67fa1c4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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