diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-15 12:04:07 -0600 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-15 12:04:07 -0600 |
commit | fc25e189650a7ad6fb341487ac7fbb91aa6becfa (patch) | |
tree | 60768b7724be37b55672e76142e1ac54763737f0 /arch-nspawn.in | |
parent | 47108a24dee698bcd43d83be24e204ccd27776a3 (diff) | |
parent | 8c4553f68cb1c01b24f4883db0032f646b2e77dd (diff) |
Merge branch 'devtools'
Diffstat (limited to 'arch-nspawn.in')
-rw-r--r-- | arch-nspawn.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index fdff31e..8ef39ed 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 2>/dev/null \ + -D "$working_dir" \ + --machine "${working_dir//\//-}" \ + "${mount_args[@]}" \ + "$@" |