From 1489f754197a7a013e17328f9cb2fb3d2e5bdfe9 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Fri, 3 May 2013 04:52:32 +0200
Subject: arch-nspawn: setarch to CARCH

Allows calling makechrootpkg without worrying about the architecture
---
 arch-nspawn.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'arch-nspawn.in')

diff --git a/arch-nspawn.in b/arch-nspawn.in
index fdff31e..b3dfbfb 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -96,4 +96,10 @@ fi
 build_mount_args
 copy_hostconf
 
-exec systemd-nspawn -D "$working_dir" --machine "${working_dir//\//-}" "${mount_args[@]}" "$@"
+eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
+
+exec ${CARCH:+setarch "$CARCH"} systemd-nspawn \
+	-D "$working_dir" \
+	--machine "${working_dir//\//-}" \
+	"${mount_args[@]}" \
+	"$@"
-- 
cgit v1.2.3