X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=3f85d501547bcb974d2f14f16ad6d5e976ecd6df;hb=24b9fd1c70013f5847d3a4658e56bd44534e7890;hp=bb9902e4d5c638ebfdf8f9f536e152c5d157ce90;hpb=cf052ec1816745240c65745a0de6cc4dce8c8433;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index bb9902e..3f85d50 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -20,7 +20,9 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOXAUTOLOGIN}" ]
+. /live.vars
+
+if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ]
 then
 	exit 0
 fi
@@ -53,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}
@@ -64,6 +80,8 @@ AUTOLOGINAGAIN=true
 AUTOLOGINDELAY=0
 EOF
 
+	fi
+
 elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin