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

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 2c880b7..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
@@ -71,13 +71,13 @@ then
 		  -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=${USERNAME}/" \
 		  -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
 	/root/etc/kde3/kdm/kdmrc
-elif [ -f /root/usr/lib/kde4/etc/kde4/kdm/kdmrc ]
+elif [ -f /root/etc/kde4/kdm/kdmrc ]
 then
 	# Configure KDM-KDE4 autologin
 	sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
 		  -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
 		  -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
-	/root/usr/lib/kde4/etc/kde4/kdm/kdmrc
+	/root/etc/kde4/kdm/kdmrc
 fi
 
 log_end_msg