summaryrefslogtreecommitdiff
path: root/src/chroot-tools/arch-nspawn.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/chroot-tools/arch-nspawn.patch')
-rw-r--r--src/chroot-tools/arch-nspawn.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch
index 792b99f..3a48cdd 100644
--- a/src/chroot-tools/arch-nspawn.patch
+++ b/src/chroot-tools/arch-nspawn.patch
@@ -1,5 +1,5 @@
---- arch-nspawn.in 2014-05-11 00:58:42.030932904 -0400
-+++ arch-nspawn.ugly 2014-05-11 22:33:47.186717386 -0400
+--- 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
@@ -7,13 +7,13 @@
# 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.
-@@ -103,7 +105,8 @@
- machine_name="${machine_name#-}"
- fi
+@@ -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" \
- --machine "$machine_name" \
+ --register=no \
"${mount_args[@]}" \