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

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index ae653fd..38c3a8f 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -20,17 +20,19 @@ esac
 
 # live-initramfs header
 
+. /live.vars
+
+if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ]
+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
@@ -57,6 +59,8 @@ fi
 
 if [ -d /root/etc/default/kdm.d/ ]
 then
+	if ! grep -qs "^AUTOLOGIN" /root/etc/default/kdm.d/live-autologin
+	then
 
 cat >> /root/etc/default/kdm.d/live-autologin << EOF
 AUTOLOGINUSER=${USERNAME}
@@ -64,6 +68,8 @@ AUTOLOGINAGAIN=true
 AUTOLOGINDELAY=0
 EOF
 
+	fi
+
 elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin