Correcting kdm live-autologin handling to not always append entries f…

…orever when using persistency.
grml · Mar 26, 2009 · 8bac4e8 · 8bac4e8
1 parent 16c6436
commit 8bac4e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
@@ -104,7 +104,10 @@ then
 
 	if [ -d /root/etc/default/kdm.d/ ]
 	then
-		printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
+		if ! grep -qs "^LANGUAGE" "${LANG}"
+		then
+			printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
+		fi
 	elif [ -f /root/etc/kde3/kdm/kdmrc ]
 	then
 		sed -i -r -e "s/#Language=.*/Language=${language}/" \

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
@@ -59,13 +59,17 @@ 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}
 AUTOLOGINAGAIN=true
 AUTOLOGINDELAY=0
 EOF
 
+	fi
+
 elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin