diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 22:40:57 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 22:40:57 -0400 |
commit | 3d9850b56c77b51edcdb2697c74ba2d1761109dc (patch) | |
tree | e5fe03bcbf6cd4d72f7c31a3129156e6784c4325 /src/chroot-tools/arch-nspawn.patch | |
parent | 52cc0c3ff27d4c48d3461d9fd898367aa4a92631 (diff) | |
parent | 813bfa255a1e46f05e08dcb587b8f417b995b2d4 (diff) |
Merge branch 'master' into lukeshu/xbs
Diffstat (limited to 'src/chroot-tools/arch-nspawn.patch')
-rw-r--r-- | src/chroot-tools/arch-nspawn.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch new file mode 100644 index 0000000..5e0f10b --- /dev/null +++ b/src/chroot-tools/arch-nspawn.patch @@ -0,0 +1,19 @@ +--- arch-nspawn.in 2014-05-11 00:58:42.030932904 -0400 ++++ arch-nspawn.ugly 2014-05-11 22:33:47.186717386 -0400 +@@ -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. +@@ -103,7 +105,8 @@ + machine_name="${machine_name#-}" + fi + +-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" \ + "${mount_args[@]}" \ |