summaryrefslogtreecommitdiff
path: root/src/chroot-tools/arch-nspawn.patch
blob: 3a48cdd2f737e2dc7b84d6b0cd98255779165f80 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
--- arch-nspawn.in	2014-11-05 18:57:12.495990013 -0500
+++ arch-nspawn.ugly	2014-11-05 18:57:12.535989271 -0500
@@ -1,4 +1,6 @@
 #!/bin/bash
+# License: GNU GPLv2
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
@@ -96,7 +98,8 @@
 
 eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
 
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+CHROOTARCH="$(. "$(librelib conf)"; get_var chroot CHROOTARCH "$CARCH")"
+exec ${CHROOTARCH:+setarch "$CHROOTARCH"} systemd-nspawn -q \
 	-D "$working_dir" \
 	--register=no \
 	"${mount_args[@]}" \