X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=28a3141ba5e01ad3ef2bb8c4cea082b8f94323c7;hb=6d00906410acd695f73f30ae35a8e3c2492cae10;hp=ae653fd9c1c850e4045bec7cc0f0e68bbe00b49a;hpb=046580edb4877fc1a4a823e882a0949fbc729544;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index ae653fd..28a3141 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -22,15 +22,15 @@ esac
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up automatic login"
-
-# live-initramfs script
-
-if [ -n "${NOXAUTOLOGIN}" ]
+if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ]
 then
 	exit 0
 fi
 
+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