forked from mirrored-repos/manjaro-tools
buildiso: always use build locales should fix locales problems all over live session
mkchroot: default to en_US for build locales in chroot
This commit is contained in:
parent
0338813ef0
commit
ab4f9ffe78
3 changed files with 2 additions and 3 deletions
|
@ -111,7 +111,7 @@ if ${build_locales};then
|
||||||
info "Using build locales ..."
|
info "Using build locales ..."
|
||||||
mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.bak"
|
mv "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.bak"
|
||||||
mv "$working_dir/etc/locale.conf" "$working_dir/etc/locale.conf.bak"
|
mv "$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 UTF-8\n' en_US > "$working_dir/etc/locale.gen"
|
||||||
printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
|
printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
|
||||||
printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf"
|
printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -291,7 +291,6 @@ copy_from_cache(){
|
||||||
}
|
}
|
||||||
|
|
||||||
chroot_create(){
|
chroot_create(){
|
||||||
[[ "${1##*/}" == "root-image" ]] && local flag="-L"
|
|
||||||
setarch "${target_arch}" \
|
setarch "${target_arch}" \
|
||||||
mkchroot ${mkchroot_args[*]} ${flag} $@
|
mkchroot ${mkchroot_args[*]} ${flag} $@
|
||||||
}
|
}
|
||||||
|
|
|
@ -743,7 +743,7 @@ load_profile(){
|
||||||
|
|
||||||
iso_file=$(gen_iso_fn).iso
|
iso_file=$(gen_iso_fn).iso
|
||||||
|
|
||||||
mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K)
|
mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K -L)
|
||||||
work_dir=${chroots_iso}/${profile}/${target_arch}
|
work_dir=${chroots_iso}/${profile}/${target_arch}
|
||||||
|
|
||||||
iso_dir="${cache_dir_iso}/${edition}/${dist_release}/${profile}"
|
iso_dir="${cache_dir_iso}/${edition}/${dist_release}/${profile}"
|
||||||
|
|
Loading…
Reference in a new issue