Merging casper 1.217.

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

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 143e9f4..12c937d 100755 (executable)
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -66,15 +66,12 @@ TimedLoginDelay=10"
 
        # Prevent from updating if parameters already present (persistent usb
        # key)
-       if ! $(grep -qs 'AutomaticLoginEnable' $GDMCustomFile)
+       if ! $(grep -qs '\[daemon\]' $GDMCustomFile)
        then
-               if $(grep -qs '\[daemon\]' $GDMCustomFile)
-               then
-                       sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
-               else
-                       printf '[daemon]\n%s' "$AutologinParameters" >> $GDMCustomFile
-               fi
+               echo '[daemon]' >> $GDMCustomFile
        fi
+
+       sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
 fi
 
 if [ -d /root/etc/default/kdm.d/ ]
@@ -106,4 +103,12 @@ then
        /root/etc/kde4/kdm/kdmrc
 fi
 
+if [ -f /root/etc/lxdm/lxdm.conf ]
+then
+       # Configure LXDM autologin
+       sed -i -r -e "s/^# autologin=dgod/autologin=$USERNAME/" \
+                 -e "s/^# session/session/" \
+       /root/etc/lxdm/lxdm.conf
+fi
+
 log_end_msg