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

[chroot-run] add keep_mirrors arg

Browse source
This commit is contained in:
udeved 2015-06-03 17:53:35 +02:00
parent c4f89cebb4
commit ad11aefb7c
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/chroot-run.in
View file

@ -16,6 +16,7 @@ version=@version@
[[ -r @libdir@/util-mount.sh ]] && source @libdir@/util-mount.sh [[ -r @libdir@/util-mount.sh ]] && source @libdir@/util-mount.sh
working_dir='' working_dir=''
keep_mirrors=false
usage() { usage() {
echo "Usage: ${0##*/} [options] working-dir [run arguments]" echo "Usage: ${0##*/} [options] working-dir [run arguments]"
@ -36,7 +37,7 @@ usage() {
orig_argv=("$@") orig_argv=("$@")
opts='hC:M:S:c:r:w:B:' opts='hKC:M:S:c:r:w:B:'
while getopts ${opts} arg; do while getopts ${opts} arg; do
case "${arg}" in case "${arg}" in
@ -47,6 +48,7 @@ while getopts ${opts} arg; do
r) mountargs_ro="$OPTARG" ;; r) mountargs_ro="$OPTARG" ;;
w) mountargs_rw="$OPTARG" ;; w) mountargs_rw="$OPTARG" ;;
B) build_mirror="$OPTARG" ;; B) build_mirror="$OPTARG" ;;
K) keep_mirrors=true ;;
h|?) usage ;; h|?) usage ;;
*) error "invalid argument '$arg'"; usage ;; *) error "invalid argument '$arg'"; usage ;;
esac esac
@ -76,7 +78,12 @@ copy_hostconf () {
if [[ -n ${build_mirror} ]];then if [[ -n ${build_mirror} ]];then
build_mirror=${build_mirror}'/$repo/$arch' build_mirror=${build_mirror}'/$repo/$arch'
echo "Server = ${build_mirror}" > "$1/etc/pacman.d/mirrorlist" if ${keep_mirrors}; then
source $1/etc/pacman-mirrors.conf
sed -e "s|/stable|/${Branch}|g" -i "$1/etc/pacman.d/mirrorlist"
else
echo "Server = ${build_mirror}" > "$1/etc/pacman.d/mirrorlist"
fi
else else
source $1/etc/pacman-mirrors.conf source $1/etc/pacman-mirrors.conf
sed -e "s|/stable|/${Branch}|g" -i "$1/etc/pacman.d/mirrorlist" sed -e "s|/stable|/${Branch}|g" -i "$1/etc/pacman.d/mirrorlist"