X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=2758c95ac39e5b33a4e4bcfd18ce0c2062b2ddb2;hb=1bad81c0450e84a94dc1d5f4ead9886f15749b80;hp=28a3141ba5e01ad3ef2bb8c4cea082b8f94323c7;hpb=2910ae281a07441f55215ca74ec38f1d499420f2;p=live-boot-grml.git

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 28a3141..2758c95 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -20,13 +20,15 @@ esac
 
 # live-initramfs header
 
-. /scripts/live-functions
+. /live.vars
 
 if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ]
 then
 	exit 0
 fi
 
+. /scripts/live-functions
+
 log_begin_msg "Setting up automatic login"
 
 # live-initramfs script
@@ -53,10 +55,32 @@ then
 	       -e "s/^TimedLogin=.*\$/TimedLogin=${USERNAME}/" \
 	       -e "s/^TimedLoginDelay=.*\$/TimedLoginDelay=10/" \
 	${GDMCONF}
+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 'AutomaticLoginEnable' $GDMCustomFile)
+	then
+		if $(grep -qs '\[daemon\]' $GDMCustomFile)
+		then
+			sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
+		else
+			echo -e "[daemon]\n$AutologinParameters" >> $GDMCustomFile
+		fi
+	fi
 fi
 
 if [ -d /root/etc/default/kdm.d/ ]
 then
+	if ! grep -qs "^AUTOLOGIN" /root/etc/default/kdm.d/live-autologin
+	then
 
 cat >> /root/etc/default/kdm.d/live-autologin << EOF
 AUTOLOGINUSER=${USERNAME}
@@ -64,6 +88,8 @@ AUTOLOGINAGAIN=true
 AUTOLOGINDELAY=0
 EOF
 
+	fi
+
 elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin