X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=7fb2b13fa9cfd0a88149c0d315eeaa0d88c762da;hb=a8b795f00da8ab5952ef11f1f4ef170d47591c98;hp=4b203d772a744d330ba9c70173824921f0f890d9;hpb=96db9eaff01b09f16ad2a22d7d84a344ef8a9723;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 4b203d7..7fb2b13 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -20,17 +20,19 @@ esac
 
 # live-initramfs header
 
-. /scripts/live-functions
-
-log_begin_msg "Setting up automatic login..."
+. /live.vars
 
-# live-initramfs script
-
-if [ -n "${NOXAUTOLOGIN}" ]
+if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ]
 then
 	exit 0
 fi
 
+. /scripts/live-functions
+
+log_begin_msg "Setting up automatic login"
+
+# live-initramfs script
+
 # chroot needed to handle symlinks correctly
 if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]
 then