--- arch-nspawn.in 2015-01-04 16:32:42.463202960 -0500 +++ arch-nspawn.ugly 2015-01-05 14:05:01.749597982 -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. @@ -92,11 +94,14 @@ fi build_mount_args +cache_dirs+=('/repo/') 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 \ +exec ${CHROOTARCH:+setarch "$CHROOTARCH"} systemd-nspawn -q \ -D "$working_dir" \ --register=no \ "${mount_args[@]}" \