Set default cow_mountopt where the other defaults are used.

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

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 41c98dc..2c880b7 100755 (executable)
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -57,11 +57,13 @@ fi
 
 if [ -d /root/etc/default/kdm.d/ ]
 then
-       cat > /root/etc/default/kdm.d/live-autologin << EOF
+
+cat >> /root/etc/default/kdm.d/live-autologin << EOF
 AUTOLOGINUSER=${USERNAME}
 AUTOLOGINAGAIN=true
 AUTOLOGINDELAY=0
 EOF
+
 elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
        # Configure KDM autologin
@@ -69,6 +71,13 @@ then
                  -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=${USERNAME}/" \
                  -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
        /root/etc/kde3/kdm/kdmrc
+elif [ -f /root/usr/lib/kde4/etc/kde4/kdm/kdmrc ]
+then
+       # Configure KDM-KDE4 autologin
+       sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
+                 -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \
+                 -e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
+       /root/usr/lib/kde4/etc/kde4/kdm/kdmrc
 fi
 
 log_end_msg