X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=2c880b709b38a23031bf774b1d50f3801a84695d;hb=bd2cfbec5fe67ea696162c1caa5c80187a070bee;hp=40383cbf2fa5506c1456590d92f38eb444c844df;hpb=b15f95e06e40a70ed75c30b31cee89d43ec8196b;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 40383cb..2c880b7 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -42,29 +42,42 @@ fi
 # chroot needed to handle symlinks correctly
 if chroot /root [ -f ${GDMCONF} ]
 then
-	if [ "${BUILD_SYSTEM}" = "Debian" ]
-	then
-		# true hack ! -- nohar
-		chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
-	fi
+	# true hack ! -- nohar
+	chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
 
 	# Configure GDM autologin
 	chroot /root \
 	sed -i -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
-	       -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$USERNAME/" \
+	       -e "s/^AutomaticLogin=.*\$/AutomaticLogin=${USERNAME}/" \
 	       -e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
-	       -e "s/^TimedLogin=.*\$/TimedLogin=$USERNAME/" \
+	       -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
 	       -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
 	${GDMCONF}
 fi
 
-if [ -f /root/etc/kde3/kdm/kdmrc ]
+if [ -d /root/etc/default/kdm.d/ ]
+then
+
+cat >> /root/etc/default/kdm.d/live-autologin << EOF
+AUTOLOGINUSER=${USERNAME}
+AUTOLOGINAGAIN=true
+AUTOLOGINDELAY=0
+EOF
+
+elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin
 	sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-		  -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
+		  -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 ]
+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
 fi
 
 log_end_msg