Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archbuild.in9
-rw-r--r--lib/common.sh51
-rw-r--r--makechrootpkg.in19
-rw-r--r--mkarchroot.in106
4 files changed, 129 insertions, 56 deletions
diff --git a/archbuild.in b/archbuild.in
index 10d33b8..a41d490 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -43,17 +43,12 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
[[ -d $copy ]] || continue
msg2 "Deleting chroot copy '$(basename "${copy}")'..."
- exec 9>"$copydir.lock"
- if ! flock -n 9; then
- stat_busy "Locking chroot copy '$copy'"
- flock 9
- stat_done
- fi
+ lock_open_write 9 "$copy.lock" "Locking chroot copy '$copy'"
{ type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
rm -rf --one-file-system "${copy}"
done
- exec 9>&-
+ lock_close 9
rm -rf --one-file-system "${chroots}/${repo}-${arch}"
mkdir -p "${chroots}/${repo}-${arch}"
diff --git a/lib/common.sh b/lib/common.sh
index b39bbbc..932799e 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -104,6 +104,57 @@ in_array() {
}
##
+# usage : lock_open_write( $fd, $path, $wait_message )
+##
+lock_open_write() {
+ local fd=$1
+ local path=$2
+ local msg=$3
+
+ # Only reopen the FD if it wasn't handed to us
+ if [[ $(readlink -f /dev/fd/$fd) != "${path}.lock" ]]; then
+ mkdir -p "${path%/*}"
+ eval "exec $fd>${path}.lock"
+ fi
+
+ if ! flock -n $fd; then
+ stat_busy "$msg"
+ flock $fd
+ stat_done
+ fi
+}
+
+##
+# usage : lock_open_read( $fd, $path, $wait_message )
+##
+lock_open_read() {
+ local fd=$1
+ local path=$2
+ local msg=$3
+
+ # Only reopen the FD if it wasn't handed to us
+ if [[ $(readlink -f /dev/fd/$fd) != "${path}.lock" ]]; then
+ mkdir -p "${path%/*}"
+ eval "exec $fd>${path}.lock"
+ fi
+
+ if ! flock -sn $fd; then
+ stat_busy "$msg"
+ flock -s $fd
+ stat_done
+ fi
+}
+
+
+##
+# usage : lock_close( $fd )
+##
+lock_close() {
+ local fd=$1
+ eval "exec $fd>&-"
+}
+
+##
# usage : get_full_version( [$pkgname] )
# return : full version spec, including epoch (if necessary), pkgver, pkgrel
##
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 762ad7b..244700c 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -114,23 +114,12 @@ umask 0022
# Lock the chroot we want to use. We'll keep this lock until we exit.
# Note this is the same FD number as in mkarchroot
-exec 9>"$copydir.lock"
-if ! flock -n 9; then
- stat_busy "Locking chroot copy '$copy'"
- flock 9
- stat_done
-fi
+lock_open_write 9 "$copydir.lock" "Locking chroot copy '$copy'"
if [[ ! -d $copydir ]] || $clean_first; then
# Get a read lock on the root chroot to make
# sure we don't clone a half-updated chroot
- exec 8>"$chrootdir/root.lock"
-
- if ! flock -sn 8; then
- stat_busy "Locking clean chroot"
- flock -s 8
- stat_done
- fi
+ lock_open_read 8 "$chrootdir/root" "Locking clean chroot"
stat_busy 'Creating clean working copy'
use_rsync=false
@@ -149,7 +138,7 @@ if [[ ! -d $copydir ]] || $clean_first; then
stat_done
# Drop the read lock again
- exec 8>&-
+ lock_close 8
fi
if [[ -n $install_pkg ]]; then
@@ -267,7 +256,7 @@ cat >"$copydir/chrootbuild" <<EOF
export HOME=/build
cd /build
-sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
+sudo -u nobody ${MAKEPKG:-makepkg} $makepkg_args || touch BUILD_FAILED
[[ -f BUILD_FAILED ]] && exit 1
diff --git a/mkarchroot.in b/mkarchroot.in
index 20de5e6..4d49be3 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -15,6 +15,7 @@ CHROOT_VERSION='v2'
FORCE='n'
RUN=''
NOCOPY='n'
+NONETWORK='n'
working_dir=''
@@ -22,50 +23,87 @@ APPNAME=$(basename "${0}")
# usage: usage <exitvalue>
usage() {
- echo "Usage: ${APPNAME} [options] working-dir [package-list | app]"
+ echo "Usage: ${APPNAME} [options] working-dir [action]"
echo ' options:'
- echo ' -r <app> Run "app" within the context of the chroot'
- echo ' -u Update the chroot via pacman'
echo ' -f Force overwrite of files in the working-dir'
echo ' -C <file> Location of a pacman config file'
echo ' -M <file> Location of a makepkg config file'
echo ' -n Do not copy config files into the chroot'
echo ' -c <dir> Set pacman cache'
- echo ' -h This message'
- exit 1
+ echo ' -N Disable networking in the chroot'
+ echo ' actions:'
+ echo ' -i <pkg-list> Install "pkg-list" in the chroot.'
+ echo ' Creates the chroot if necessary, workding-dir must exist'
+ echo ' -r <cmd> Run "cmd" within the context of the chroot'
+ echo ' -u Update the chroot via pacman'
+ echo ' -h Print this message'
+
+ exit ${1-1}
}
-while getopts 'r:ufnhC:M:c:' arg; do
+################################################################################
+
+while getopts 'fC:M:nc:Nr:uh' arg; do
case "${arg}" in
- r) RUN="$OPTARG" ;;
- u) RUN='/bin/sh -c "pacman -Syu --noconfirm && (pacman -Qqu >/dev/null && pacman -Su --noconfirm || exit 0)"' ;;
f) FORCE='y' ;;
C) pac_conf="$OPTARG" ;;
M) makepkg_conf="$OPTARG" ;;
n) NOCOPY='y' ;;
c) cache_dir="$OPTARG" ;;
- h|?) usage ;;
+ N) NONETWORK='y' ;;
+
+ r) action="-$arg"; action_arg="$OPTARG" ;;
+ u|h) action="-$arg" ;;
+
*) error "invalid argument '${arg}'"; usage ;;
esac
done
-if (( $EUID != 0 )); then
- die 'This script must be run as root.'
-fi
-
shift $(($OPTIND - 1))
-if [[ -z $RUN ]] && (( $# < 2 )); then
- die 'You must specify a directory and one or more packages.'
-elif (( $# < 1 )); then
- die 'You must specify a directory.'
+if [[ -n $action ]]; then
+ case $# in
+ 0) error 'You must specify a directory.'; usage ;;
+ 1)
+ args=("$1" "$action")
+ [[ -n $action_arg ]] && args+=("$action_arg")
+ set -- "${args[@]}"
+ unset args action action_arg
+ ;;
+ *) error 'Extra arguments.'; usage ;;
+ esac
+else
+ if (( $# < 2 )); then
+ error 'You must specify a directory and an action.'
+ usage
+ fi
fi
-working_dir="$(readlink -f ${1})"
+working_dir="$(readlink -f "${1}")"
shift 1
-
[[ -z $working_dir ]] && die 'Please specify a working directory.'
+action=$1
+shift 1
+case "$action" in
+ -i) PKGS=("$@") ;;
+ -r) RUN="$*" ;;
+ -u)
+ (( $# > 0 )) && { error 'Extra arguments.'; usage; }
+ RUN='/bin/sh -c "pacman -Syu --noconfirm && (pacman -Qqu >/dev/null && pacman -Su --noconfirm || exit 0)"'
+ ;;
+ -h) usage 0 ;;
+ -*) error "invalid argument '${action#-}'"; usage ;;
+ *) PKGS=("$action" "$@") ;; # for compatability with mkarchroot
+esac
+unset action
+
+################################################################################
+
+if (( $EUID != 0 )); then
+ die 'This script must be run as root.'
+fi
+
if [[ -z $cache_dir ]]; then
cache_dirs=($(pacman -v $cache_conf 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
else
@@ -121,34 +159,34 @@ copy_hostconf () {
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i ${working_dir}/etc/pacman.conf
}
+trap_unmount_err () {
+ error "Error unmounting"
+}
+
trap_chroot_umount () {
- trap 'trap_abort' INT QUIT TERM HUP
- trap 'trap_exit' EXIT
+ trap 'trap_unmount_err' INT QUIT TERM HUP EXIT
for cache_dir in ${cache_dirs[@]}; do
umount "${working_dir}/${cache_dir}"
done
[[ -n $host_mirror_path ]] && umount "${working_dir}/${host_mirror_path}"
+
+ trap 'trap_abort' INT QUIT TERM HUP
+ trap 'trap_exit' EXIT
}
chroot_lock () {
- # Only reopen the FD if it wasn't handed to us
- if [[ $(readlink -f /dev/fd/9) != "${working_dir}.lock" ]]; then
- exec 9>"${working_dir}.lock"
- fi
-
- # Lock the chroot. Take note of the FD number.
- if ! flock -n 9; then
- stat_busy "Locking chroot"
- flock 9
- stat_done
- fi
+ lock_open_write 9 "${working_dir}" "Locking chroot"
}
chroot_run() {
local dir=$1
shift
- eval systemd-nspawn -D "${dir}" -- ${@} 2>/dev/null
+ local nspawn_args=(-D "$dir")
+ if [[ $NONETWORK = y ]]; then
+ nspawn_args+=(--private-network)
+ fi
+ eval systemd-nspawn "${nspawn_args[@]}" -- "${@}" 2>/dev/null
}
# }}}
@@ -192,7 +230,7 @@ else
if [[ $FORCE = 'y' ]]; then
pacargs="$pacargs --force"
fi
- if ! pacstrap -GMcd "${working_dir}" ${pacargs} $@; then
+ if ! pacstrap -GMcd "${working_dir}" ${pacargs} "${PKGS[@]}"; then
die 'Failed to install all packages'
fi
fi