From a59555f23ea3fbf55587d6cd852a241490ba0967 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 8 Jan 2015 17:51:39 +0100 Subject: [PATCH] extend buildlocales switch to locael-gen; triggers with certain iso profiles for unknow reasons a locked /dev mount --- bin/mkchroot.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/mkchroot.in b/bin/mkchroot.in index 8b70f2c..97e0d37 100644 --- a/bin/mkchroot.in +++ b/bin/mkchroot.in @@ -81,12 +81,14 @@ basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ echo "$version" > "$working_dir/.manjaro-tools" -${build_locales} && printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" -${build_locales} && echo 'LANG=C' > "$working_dir/etc/locale.conf" +if ${build_locales};then + printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" + echo 'LANG=C' > "$working_dir/etc/locale.conf" -exec chroot-run \ - ${pac_conf:+-C "$pac_conf"} \ - ${makepkg_conf:+-M "$makepkg_conf"} \ - ${mirrors_conf:+-S "$mirrors_conf"} \ - ${cache_dir:+-c "$cache_dir"} \ - "$working_dir" locale-gen + exec chroot-run \ + ${pac_conf:+-C "$pac_conf"} \ + ${makepkg_conf:+-M "$makepkg_conf"} \ + ${mirrors_conf:+-S "$mirrors_conf"} \ + ${cache_dir:+-c "$cache_dir"} \ + "$working_dir" locale-gen +fi