projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding upstream version 2.0~a1.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
14locales
diff --git
a/scripts/live-bottom/14locales
b/scripts/live-bottom/14locales
index
6348338
..
e53e487
100755
(executable)
--- a/
scripts/live-bottom/14locales
+++ b/
scripts/live-bottom/14locales
@@
-18,7
+18,7
@@
case "${1}" in
;;
esac
;;
esac
-# live-
initramfs
header
+# live-
boot
header
if [ -n "${NOLOCALES}" ]
then
if [ -n "${NOLOCALES}" ]
then
@@
-32,7
+32,7
@@
log_begin_msg "Setting up locales"
# Cosmetic line wrapping for output of local-gen
echo
# Cosmetic line wrapping for output of local-gen
echo
-# live-
initramfs
script
+# live-
boot
script
if [ -e /root/etc/default/locale ]
then
if [ -e /root/etc/default/locale ]
then
@@
-104,7
+104,10
@@
then
if [ -d /root/etc/default/kdm.d/ ]
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}/" \
elif [ -f /root/etc/kde3/kdm/kdmrc ]
then
sed -i -r -e "s/#Language=.*/Language=${language}/" \
@@
-113,8
+116,8
@@
then
really_export LANG
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}" ]
printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen
if [ -z "${SILENT}" ]