root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-iso] use new mkchroot arg

Browse source
This commit is contained in:
udeved 2015-06-03 17:48:23 +02:00
parent 33cb3c1ef9
commit c6895e0031
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/mkchroot.in
View file

@ -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

2
lib/util-iso.sh
View file

@ -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