58ff428757
As described in2be79c6("run the chroot in a new PID namespace"), child processes can hang around and keep various files open. This may prevent filesystems from being unmounted (as they are still in-use). When adding unshare mode, I did not quite understand this distinction (and I wasn't testing with e.g. gnupg) so I didn't catch this. Fix this by always using unshare to create a second pid namespace for "worker" processes. This ensures that all children are dead when we start unmounting things. As the top-level unshare is no longer always necessary, convert the unshare variable to a binary value. Fixes:ee9db7d("Add unshare mode to pacstrap") Closes: #21
140 lines
3.3 KiB
Bash
140 lines
3.3 KiB
Bash
#!/bin/bash
|
|
|
|
#
|
|
# Assumptions:
|
|
# 1) User has partitioned, formatted, and mounted partitions on /mnt
|
|
# 2) Network is functional
|
|
# 3) Arguments passed to the script are valid pacman targets
|
|
# 4) A valid mirror appears in /etc/pacman.d/mirrorlist
|
|
#
|
|
|
|
shopt -s extglob
|
|
|
|
m4_include(common)
|
|
|
|
hostcache=0
|
|
copykeyring=1
|
|
copymirrorlist=1
|
|
pacmode=-Sy
|
|
setup=chroot_setup
|
|
unshare=0
|
|
|
|
usage() {
|
|
cat <<EOF
|
|
usage: ${0##*/} [options] root [packages...]
|
|
|
|
Options:
|
|
-C <config> Use an alternate config file for pacman
|
|
-c Use the package cache on the host, rather than the target
|
|
-G Avoid copying the host's pacman keyring to the target
|
|
-i Prompt for package confirmation when needed (run interactively)
|
|
-M Avoid copying the host's mirrorlist to the target
|
|
-N Run in unshare mode as a regular user
|
|
-U Use pacman -U to install packages
|
|
|
|
-h Print this help message
|
|
|
|
pacstrap installs packages to the specified new root directory. If no packages
|
|
are given, pacstrap defaults to the "base" group.
|
|
|
|
EOF
|
|
}
|
|
|
|
if [[ -z $1 || $1 = @(-h|--help) ]]; then
|
|
usage
|
|
exit $(( $# ? 0 : 1 ))
|
|
fi
|
|
|
|
while getopts ':C:cdGiMNU' flag; do
|
|
case $flag in
|
|
C)
|
|
pacman_config=$OPTARG
|
|
;;
|
|
d)
|
|
# retired flag. does nothing.
|
|
;;
|
|
c)
|
|
hostcache=1
|
|
;;
|
|
i)
|
|
interactive=1
|
|
;;
|
|
G)
|
|
copykeyring=0
|
|
;;
|
|
M)
|
|
copymirrorlist=0
|
|
;;
|
|
N)
|
|
setup=unshare_setup
|
|
unshare=1
|
|
;;
|
|
U)
|
|
pacmode=-U
|
|
;;
|
|
:)
|
|
die '%s: option requires an argument -- '\''%s'\' "${0##*/}" "$OPTARG"
|
|
;;
|
|
?)
|
|
die '%s: invalid option -- '\''%s'\' "${0##*/}" "$OPTARG"
|
|
;;
|
|
esac
|
|
done
|
|
shift $(( OPTIND - 1 ))
|
|
|
|
(( $# )) || die "No root directory specified"
|
|
newroot=$1; shift
|
|
pacman_args=("${@:-base}")
|
|
|
|
if (( ! hostcache )); then
|
|
pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
|
|
fi
|
|
|
|
if (( ! interactive )); then
|
|
pacman_args+=(--noconfirm)
|
|
fi
|
|
|
|
if [[ $pacman_config ]]; then
|
|
pacman_args+=(--config="$pacman_config")
|
|
fi
|
|
|
|
[[ -d $newroot ]] || die "%s is not a directory" "$newroot"
|
|
|
|
pacstrap() {
|
|
(( EUID == 0 )) || die 'This script must be run with root privileges'
|
|
|
|
# create obligatory directories
|
|
msg 'Creating install root at %s' "$newroot"
|
|
mkdir -m 0755 -p "$newroot"/var/{cache/pacman/pkg,lib/pacman,log} "$newroot"/{dev,run,etc/pacman.d}
|
|
mkdir -m 1777 -p "$newroot"/tmp
|
|
mkdir -m 0555 -p "$newroot"/{sys,proc}
|
|
|
|
# mount API filesystems
|
|
$setup "$newroot" || die "failed to setup chroot %s" "$newroot"
|
|
|
|
if (( copykeyring )); then
|
|
# if there's a keyring on the host, copy it into the new root, unless it exists already
|
|
if [[ -d /etc/pacman.d/gnupg && ! -d $newroot/etc/pacman.d/gnupg ]]; then
|
|
cp -a --no-preserve=ownership /etc/pacman.d/gnupg "$newroot/etc/pacman.d/"
|
|
fi
|
|
fi
|
|
|
|
msg 'Installing packages to %s' "$newroot"
|
|
if ! $pid_unshare pacman -r "$newroot" $pacmode "${pacman_args[@]}"; then
|
|
die 'Failed to install packages to new root'
|
|
fi
|
|
|
|
if (( copymirrorlist )); then
|
|
# install the host's mirrorlist onto the new root
|
|
cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
|
|
fi
|
|
}
|
|
|
|
if (( unshare )); then
|
|
$mount_unshare bash -c "$(declare_all); pacstrap"
|
|
else
|
|
pacstrap
|
|
fi
|
|
|
|
# vim: et ts=2 sw=2 ft=sh:
|