diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2017-02-15 14:39:25 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2017-04-05 14:42:43 -0400 |
| commit | b2c6c98a394a92cff5d08418e98d9e0d2880ec63 (patch) | |
| tree | a2e07f057a390da25b2c72ff5b7faf03d411be9e | |
| parent | ccb26ff1435a79f13bbed6a0f46d985138eedb75 (diff) | |
| download | devtools32-b2c6c98a394a92cff5d08418e98d9e0d2880ec63.tar.xz | |
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.
| -rw-r--r-- | arch-nspawn.in | 6 | ||||
| -rw-r--r-- | mkarchroot.in | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index dceb3ed..08ed2fa 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -26,16 +26,18 @@ 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 } -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 @@ -105,6 +107,8 @@ copy_hostconf eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") +[[ -z $nosetarch ]] || unset CARCH + exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ -D "$working_dir" \ --register=no \ diff --git a/mkarchroot.in b/mkarchroot.in index 4f35c1a..9f365e8 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -24,16 +24,18 @@ 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 } -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 @@ -86,6 +88,7 @@ echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" systemd-machine-id-setup --root="$working_dir" exec arch-nspawn \ + ${nosetarch:+-s} \ ${pac_conf:+-C "$pac_conf"} \ ${makepkg_conf:+-M "$makepkg_conf"} \ ${cache_dir:+-c "$cache_dir"} \ |