X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=5bd960993947168b4047a8a3ae2e1a97a0587cc6;hb=0a3c8309519c152dcc313becc0389fdb10feac8c;hp=bee8d7021fbbcb18abff0897b3790be875bfc1d6;hpb=f32a0232042e7579d78c1646d93fd68eec62aaa2;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index bee8d70..5bd9609 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -55,26 +55,18 @@ then
 	       -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
 	       -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
 	${GDMCONF}
-elif [ -d /root/etc/gdm3 ]
+elif [ -d /root/etc/gdm3 ] && [ ! -e /root/etc/gdm3/custom.conf ]
 then
-	GDMCustomFile=/root/etc/gdm3/custom.conf
-	AutologinParameters="AutomaticLoginEnable=true\n\
-AutomaticLogin=$USERNAME\n\
-TimedLoginEnable=true\n\
-TimedLogin=$USERNAME\n\
-TimedLoginDelay=10"
-
-	# Prevent from updating if parameters already present (persistent usb
-	# key)
-	if ! $(grep -qs 'AutomaticLoginEnable' $GDMCustomFile)
-	then
-		if $(grep -qs '\[daemon\]' $GDMCustomFile)
-		then
-			sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
-		else
-			echo "[daemon]\n$AutologinParameters" >> $GDMCustomFile
-		fi
-	fi
+
+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/ ]