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 casper 1.77+debian-5.
[live-boot-grml.git]
/
scripts
/
casper-bottom
/
14locales
diff --git
a/scripts/casper-bottom/14locales
b/scripts/casper-bottom/14locales
index
12cfc4b
..
18ed15e
100755
(executable)
--- a/
scripts/casper-bottom/14locales
+++ b/
scripts/casper-bottom/14locales
@@
-27,6
+27,7
@@
elif [ -e /root/etc/environment ]; then # Old locales policy
fi
if [ -n "${grep_file}" ]; then
fi
if [ -n "${grep_file}" ]; then
+ # use rootfs configured locale
locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
else
grep_file=/root/etc/default/locale
locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
else
grep_file=/root/etc/default/locale
@@
-46,27
+47,33
@@
fi
if [ "${set_locale}" ]; then
if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$' ; then
if [ "${set_locale}" ]; then
if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$' ; then
- # input is like "locale=it", so we will convert and setup also the keyboard
+ # input is like "locale=it", so we will convert and setup also the keyboard
if not already set
if [ -z "${KBD}" ]; then
# FIXME: look if this keyb is supported
KBD="${locale}"
if [ -z "${KBD}" ]; then
# FIXME: look if this keyb is supported
KBD="${locale}"
+ really_export KBD
fi
uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
locale="${locale}_${uploc}.UTF-8"
fi
fi
uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
locale="${locale}_${uploc}.UTF-8"
fi
- LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
+ LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
if [ -z "${LANG}" ]; then
log_warning_message "Locale ${locale} is unsupported."
if [ -z "${LANG}" ]; then
log_warning_message "Locale ${locale} is unsupported."
+ locale="en_US.UTF-8"
+ LANG="${locale}"
fi
fi
- if [ "${BUILD_SYSTEM}" == "Debian" ]; then
- printf 'LANG=%s\n' "${LANG}" >> "${grep_file}"
- printf '%s UTF-8\n' "${LANG}" >> /root/etc/locale.gen
- chroot /root /usr/sbin/locale-gen
- else
+ really_export LANG
+
+ if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
chroot /root /usr/sbin/locale-gen "${LANG}"
printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
chroot /root /usr/sbin/locale-gen "${LANG}"
+ casper-preseed /root debian-installer/locale "${locale}"
+ else
+ printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
+ printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
+ chroot /root /usr/sbin/locale-gen
fi
fi
fi
fi