X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=3f85d501547bcb974d2f14f16ad6d5e976ecd6df;hb=refs%2Ftags%2Fupstream%2F1.199.1;hp=7fb2b13fa9cfd0a88149c0d315eeaa0d88c762da;hpb=e0a050e3bcf51cf0bb1df9490487e0619d4aa9f9;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 7fb2b13..3f85d50 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -55,10 +55,24 @@ then
 	       -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
 	       -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
 	${GDMCONF}
+elif [ -d /root/etc/gdm3 ]
+then
+
+cat > /root/etc/gdm3/custom.conf << EOF
+[daemon]
+AutomaticLoginEnable=true
+AutomaticLogin=$USERNAME
+TimedLoginEnable=true
+TimedLogin=$USERNAME
+TimedLoginDelay=10
+EOF
+
 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}
@@ -66,6 +80,8 @@ AUTOLOGINAGAIN=true
 AUTOLOGINDELAY=0
 EOF
 
+	fi
+
 elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin