From c6895e0031178f2e252a3ab3b6a5e4e4942b851a Mon Sep 17 00:00:00 2001 From: udeved Date: Wed, 3 Jun 2015 17:48:23 +0200 Subject: [PATCH] [util-iso] use new mkchroot arg --- bin/mkchroot.in | 5 ++++- lib/util-iso.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/mkchroot.in b/bin/mkchroot.in index 3fb68ff..aa38b64 100644 --- a/bin/mkchroot.in +++ b/bin/mkchroot.in @@ -16,6 +16,7 @@ version=@version@ working_dir='' build_locales=false +restore_mirrors=false usage() { echo "Usage: ${0##*/} [options] working-dir package-list..." @@ -32,7 +33,7 @@ usage() { orig_argv=("$@") -opts='hLC:M:S:c:B:' +opts='hLRC:M:S:c:B:' while getopts ${opts} arg; do case "${arg}" in @@ -42,6 +43,7 @@ while getopts ${opts} arg; do c) cache_dir="$OPTARG" ;; L) build_locales=true ;; B) build_mirror="$OPTARG" ;; + R) restore_mirrors=true; mirrors_flag='-R' ;; h|?) usage ;; *) error "invalid argument '$arg'"; usage ;; esac @@ -112,5 +114,6 @@ exec chroot-run \ ${mirrors_conf:+-S "$mirrors_conf"} \ ${build_mirror:+-B "$build_mirror"} \ ${cache_dir:+-c "$cache_dir"} \ + ${mirrors_flag} \ "$working_dir" locale-gen diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 12b7959..ab1d63b 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -507,7 +507,7 @@ load_profile(){ check_custom_pacman_conf - mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}") + mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}" -K) work_dir=${chroots_iso}/$1/${arch} check_plymouth