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

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 2c880b7..bb9902e 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -20,17 +20,17 @@ esac
 
 # live-initramfs header
 
-. /scripts/live-functions
-
-log_begin_msg "Setting up automatic login..."
-
-# live-initramfs script
-
 if [ -n "${NOXAUTOLOGIN}" ]
 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
@@ -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