Adding upstream version 1.110.3.

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

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 40383cb..03b66f4 100755 (executable)
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -42,18 +42,15 @@ fi
 # chroot needed to handle symlinks correctly
 if chroot /root [ -f ${GDMCONF} ]
 then
-       if [ "${BUILD_SYSTEM}" = "Debian" ]
-       then
-               # true hack ! -- nohar
-               chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
-       fi
+       # true hack ! -- nohar
+       chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
 
        # Configure GDM autologin
        chroot /root \
        sed -i -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
-              -e "s/^AutomaticLogin=.*\$/AutomaticLogin=$USERNAME/" \
+              -e "s/^AutomaticLogin=.*\$/AutomaticLogin=${USERNAME}/" \
               -e "s/^TimedLoginEnable=.*\$/TimedLoginEnable=true/" \
-              -e "s/^TimedLogin=.*\$/TimedLogin=$USERNAME/" \
+              -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
               -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
        ${GDMCONF}
 fi
@@ -62,7 +59,7 @@ if [ -f /root/etc/kde3/kdm/kdmrc ]
 then
        # Configure KDM autologin
        sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-                 -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
+                 -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=${USERNAME}/" \
                  -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
        /root/etc/kde3/kdm/kdmrc
 fi