Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/arch-nspawn.in
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-02-15 14:39:25 -0500
committerLuke Shumaker <lukeshu@parabola.nu>2017-02-15 14:39:25 -0500
commitdf3eee40d3ff0a6c8532a1d19bad25d057330cd2 (patch)
treee785fbb98a6662a49ded73d111a29c55ebd27b4a /arch-nspawn.in
parente1ca5a0bc28697c545b619fe1f07bc6145ef5c38 (diff)
mkarchroot, arch-nspawn: Add an `-s` flag to inhibit `setarch`.
This allows us to run an ARM chroot on an x86 box; as the binfmt runner will set the architecture for us, and the x86 `/usr/bin/setarch` program won't know about the ARM architecture string.
Diffstat (limited to 'arch-nspawn.in')
-rw-r--r--arch-nspawn.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 19a1a89..ea6e5ea 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -27,18 +27,20 @@ usage() {
echo ' -M <file> Location of a makepkg config file'
echo ' -c <dir> Set pacman cache'
echo ' -f <file> Copy file from the host to the chroot'
+ echo ' -s Do not run setarch'
echo ' -h This message'
exit 1
}
orig_argv=("$@")
-while getopts 'hC:M:c:f:' arg; do
+while getopts 'hC:M:c:f:s' arg; do
case "$arg" in
C) pac_conf="$OPTARG" ;;
M) makepkg_conf="$OPTARG" ;;
c) cache_dir="$OPTARG" ;;
f) files+=("$OPTARG") ;;
+ s) nosetarch=1 ;;
h|?) usage ;;
*) error "invalid argument '%s'" "$arg"; usage ;;
esac
@@ -111,6 +113,8 @@ case "$CARCH" in
armv7h) CARCH=armv7l;;
esac
+[[ -z $nosetarch ]] || unset CARCH
+
exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
-D "$working_dir" \
--register=no \