diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-03-26 14:11:56 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:04 +0100 |
| commit | e094426177155af8e46f386fb0b322630898ba6c (patch) | |
| tree | e9acc4c296cda89d6f86832931b1e91affbfcfe9 /scripts | |
| parent | 10af87f0f8566c5913d60330fccec6bcc402faea (diff) | |
| download | live-boot-e094426177155af8e46f386fb0b322630898ba6c.tar.gz live-boot-e094426177155af8e46f386fb0b322630898ba6c.zip | |
Correcting kdm live-autologin handling to not always append entries forever when using persistency.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/14locales | 5 | ||||
| -rwxr-xr-x | scripts/live-bottom/15autologin | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales index 6348338..58f7e82 100755 --- 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 index 7fb2b13..38c3a8f 100755 --- a/scripts/live-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -59,6 +59,8 @@ 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} @@ -66,6 +68,8 @@ AUTOLOGINAGAIN=true AUTOLOGINDELAY=0 EOF + fi + elif [ -f /root/etc/kde3/kdm/kdmrc ] then # Configure KDM autologin |