summaryrefslogtreecommitdiff
path: root/scripts/casper-bottom/14locales
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 14:46:24 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 14:46:24 +0200
commit6c1a2cfab139bb4a61e7bcf5f4cafe3b7498f64e (patch)
tree333a05a0a341c98203688dc4d01589340eca951c /scripts/casper-bottom/14locales
parenta4a7503df76005df67b006e1324004c808830c32 (diff)
downloadlive-boot-6c1a2cfab139bb4a61e7bcf5f4cafe3b7498f64e.tar.gz
live-boot-6c1a2cfab139bb4a61e7bcf5f4cafe3b7498f64e.zip
Adding casper 1.66+debian-1.
Diffstat (limited to 'scripts/casper-bottom/14locales')
-rwxr-xr-xscripts/casper-bottom/14locales12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index ebe7616..f69fa0f 100755
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -27,6 +27,10 @@ elif [ -e /root/etc/environment ]; then # Old locales policy
grep_file=/root/etc/environment
fi
+if [ -z "${grep_file}" ]; then
+ grep_file=/root/etc/default/locale
+fi
+
# commandline
for x in $(cat /proc/cmdline); do
case $x in
@@ -49,8 +53,12 @@ fi
if [ "${set_locale}" ]; then
LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
- printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}"
- chroot /root /usr/sbin/locale-gen "${LANG}"
+ printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}"
+ if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+ chroot /root /usr/sbin/locale-gen
+ else
+ chroot /root /usr/sbin/locale-gen "${LANG}"
+ fi
fi
log_end_msg