X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=12c937d2e9e1a96e37812759de49bb31ae49d42e;hb=7111ab7c3b1220384a8f576e170ba3910110ad97;hp=dd66a838172c6ef9d687a28a1147ee94e58f5474;hpb=0b9a1586779eb10e78ade3d88e38c0d5279d2de6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index dd66a83..12c937d 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -55,18 +55,23 @@ then
 	       -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
 	       -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
 	${GDMCONF}
-elif [ -e /root/etc/gdm3 ]
+elif [ -d /root/etc/gdm3 ]
 then
+	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 '\[daemon\]' $GDMCustomFile)
+	then
+		echo '[daemon]' >> $GDMCustomFile
+	fi
 
-cat > /root/etc/gdm3/daemon.conf << EOF
-[daemon]
-AutomaticLoginEnable=true
-AutomaticLogin=$USERNAME
-TimedLoginEnable=true
-TimedLogin=$USERNAME
-TimedLoginDelay=10
-EOF
-
+	sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
 fi
 
 if [ -d /root/etc/default/kdm.d/ ]
@@ -98,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