diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 18:58:28 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 18:58:28 -0400 |
| commit | 813bfa255a1e46f05e08dcb587b8f417b995b2d4 (patch) | |
| tree | d2feedc9b750edf52788c767cc666daebb8d3884 /src/chroot-tools/arch-nspawn.patch | |
| parent | 8831cc585ae8e9071f8c022bdfaf75e42029d7e4 (diff) | |
| parent | 5051daebf722a9020b015feabc4c39e6bdb187f1 (diff) | |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/~git/packages/libretools
Conflicts:
src/librefetch/librefetch.8.ronn
Diffstat (limited to 'src/chroot-tools/arch-nspawn.patch')
| -rw-r--r-- | src/chroot-tools/arch-nspawn.patch | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch index afdf51a..5e0f10b 100644 --- a/src/chroot-tools/arch-nspawn.patch +++ b/src/chroot-tools/arch-nspawn.patch @@ -1,5 +1,5 @@ ---- arch-nspawn.in 2014-03-21 13:59:31.812992892 -0400 -+++ arch-nspawn 2014-03-21 14:24:23.520619552 -0400 +--- 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 @@ -7,3 +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 + +-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[@]}" \ |