Merging casper 1.208.

[live-boot-grml.git] / scripts / live-bottom / 15autologin

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 3f85d50..bee8d70 100755 (executable)
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -57,16 +57,24 @@ then
        ${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
-
+       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
 fi
 
 if [ -d /root/etc/default/kdm.d/ ]