diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-05-11 01:35:28 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-05-11 01:37:01 -0300 |
| commit | fb52b36bb545194ae25f69968a6374b68cd217bd (patch) | |
| tree | 8bfb7aade61e44876c103e81115bd8f7477e7b4a | |
| parent | 0800319d2676ad6c3f73c6dd6c7cafcdc052de50 (diff) | |
Fix `-s` flag to turn off setarch -> https://lists.parabola.nu/pipermail/dev/2016-May/003992.html
| -rw-r--r-- | src/chroot-tools/arch-nspawn.patch | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch index 2b46ecb..5ebda46 100644 --- a/src/chroot-tools/arch-nspawn.patch +++ b/src/chroot-tools/arch-nspawn.patch @@ -1,5 +1,5 @@ --- arch-nspawn.in 2016-05-09 18:37:11.684488405 -0400 -+++ arch-nspawn.ugly 2016-05-09 22:36:00.821147136 -0400 ++++ arch-nspawn.ugly 2016-05-11 01:33:29.914317415 -0300 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -52,7 +52,7 @@ sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$working_dir/etc/pacman.conf" } # }}} -@@ -92,9 +106,12 @@ +@@ -92,11 +106,15 @@ fi build_mount_args @@ -61,7 +61,11 @@ +if [[ -z $nosetarch ]]; then eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") ++export _setarch=${CARCH:+setarch "$CARCH"} +fi - exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ +-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ ++exec $_setarch systemd-nspawn -q \ -D "$working_dir" \ + --register=no \ + "${mount_args[@]}" \ |