[mkchroot/mkiso] create locale within root-image
This commit is contained in:
parent
09a65470f9
commit
53b745f5ee
2 changed files with 8 additions and 1 deletions
|
@ -85,6 +85,8 @@ basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
|
|||
echo "$version" > "$working_dir/.manjaro-tools"
|
||||
|
||||
if ${build_locales};then
|
||||
cp "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.bak"
|
||||
cp "$working_dir/etc/locale.conf" "$working_dir/etc/locale.conf.bak"
|
||||
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
|
||||
printf '%s.UTF-8' en_US > "$working_dir/etc/locale.conf"
|
||||
printf 'LC_MESSAGES=C' >> "$working_dir/etc/locale.conf"
|
||||
|
@ -98,3 +100,8 @@ exec chroot-run \
|
|||
${cache_dir:+-c "$cache_dir"} \
|
||||
"$working_dir" locale-gen
|
||||
|
||||
if ${build_locales};then
|
||||
cp "$working_dir/etc/locale.gen.bak" "$working_dir/etc/locale.gen"
|
||||
cp "$working_dir/etc/locale.conf.bak" "$working_dir/etc/locale.conf"
|
||||
fi
|
||||
|
||||
|
|
|
@ -149,7 +149,7 @@ clean_up(){
|
|||
|
||||
_mkchroot(){
|
||||
#set locale.gen
|
||||
if [ "${IMAGE_FOLDER}" == "livecd-image" ]; then
|
||||
if [ "${IMAGE_FOLDER}" == "root-image" ]; then
|
||||
LOCALE="-L"
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue