X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=10cae2ddfcfa1129a37ec2c1712c367523ca0afe;hb=efc1e8ac663a70d2b538aeb215f04b2d1edddbd9;hp=b0ce90d85a363b3ebc6c996cefefe93f6912391d;hpb=1e0a488b895cd6e2bf7141aa730f17da42a490f7;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index b0ce90d..10cae2d 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -42,11 +42,8 @@ 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 \
@@ -58,7 +55,16 @@ then
 	${GDMCONF}
 fi
 
-if [ -f /root/etc/kde3/kdm/kdmrc ]
+if [ -d /root/etc/default/kdm.d/ ]
+then
+
+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
 	sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \