diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-05 14:09:01 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-05 14:09:01 -0500 |
| commit | c17d98ac4c8963929f03f4185d7dc18b8a4a86da (patch) | |
| tree | 4170729a84d76098d07ca1d9253fc64544abc44b /src | |
| parent | 98f9d7d1018a47f126768f8c139fe2d1cc99fecd (diff) | |
arch-nspawn: correctly parse CHROOTARCH
Diffstat (limited to 'src')
| -rw-r--r-- | src/chroot-tools/arch-nspawn.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch index 58ac9fe..b3a6973 100644 --- a/src/chroot-tools/arch-nspawn.patch +++ b/src/chroot-tools/arch-nspawn.patch @@ -1,5 +1,5 @@ --- arch-nspawn.in 2015-01-04 16:32:42.463202960 -0500 -+++ arch-nspawn.ugly 2015-01-05 11:35:50.594150869 -0500 ++++ arch-nspawn.ugly 2015-01-05 14:05:01.749597982 -0500 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -7,7 +7,7 @@ # 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. -@@ -92,11 +94,13 @@ +@@ -92,11 +94,14 @@ fi build_mount_args @@ -15,9 +15,10 @@ copy_hostconf eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") ++CHROOTARCH=$CARCH ++eval $(grep '^CHROOTARCH=' "$working_dir/etc/libretools.d/chroot.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 \ |