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 1.136.3.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
14locales
diff --git
a/scripts/live-bottom/14locales
b/scripts/live-bottom/14locales
index
3cb58dd
..
94e3cf2
100755
(executable)
--- a/
scripts/live-bottom/14locales
+++ b/
scripts/live-bottom/14locales
@@
-44,8
+44,6
@@
if [ -n "${grep_file}" ]
then
# use rootfs configured locale
locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
then
# use rootfs configured locale
locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
-else
- grep_file=/root/etc/default/locale
fi
if [ -n "${LOCALE}" ]
fi
if [ -n "${LOCALE}" ]
@@
-95,14
+93,15
@@
EOF
if [ -z "${LANG}" ]
then
if [ -z "${LANG}" ]
then
- log_warning_m
essage
"Locale ${locale} is unsupported."
+ log_warning_m
sg
"Locale ${locale} is unsupported."
locale="en_US.UTF-8"
LANG="${locale}"
fi
really_export LANG
locale="en_US.UTF-8"
LANG="${locale}"
fi
really_export LANG
- printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
+ printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
+ printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
chroot /root /usr/sbin/locale-gen
fi
printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
chroot /root /usr/sbin/locale-gen
fi