X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F14locales;h=022a6056265ea1d4beba10f0fc49b817400ae57d;hb=24b9fd1c70013f5847d3a4658e56bd44534e7890;hp=29c405bffa6b92b872efcd5b1c355e212ea3f7b9;hpb=753beff823f1963bd98ab4057fb1c63eeb7712fe;p=live-boot-grml.git diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales index 29c405b..022a605 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}/" \ @@ -113,15 +116,15 @@ then really_export LANG - printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale - printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment + printf 'LANG="%s"\n' "${LANG}" > /root/etc/default/locale + printf 'LANG="%s"\n' "${LANG}" > /root/etc/environment printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen if [ -z "${SILENT}" ] then chroot /root /usr/sbin/locale-gen else - chroot /root /usr/sbin/local-gen > /dev/null 2>&1 + chroot /root /usr/sbin/locale-gen > /dev/null 2>&1 fi fi