diff options
Diffstat (limited to 'src/chroot-tools')
| -rw-r--r-- | src/chroot-tools/arch-nspawn.patch | 11 | ||||
| -rwxr-xr-x | src/chroot-tools/libremakepkg | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/chroot-tools/arch-nspawn.patch b/src/chroot-tools/arch-nspawn.patch index e387335..6b32f2b 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 14:51:34.678625475 -0500 +--- arch-nspawn.in 2015-05-24 19:32:57.117177433 -0600 ++++ arch-nspawn.ugly 2015-05-24 23:40:04.031482147 -0600 @@ -1,4 +1,6 @@ #!/bin/bash +# License: GNU GPLv2 @@ -7,7 +7,12 @@ # 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,6 +94,7 @@ +@@ -88,10 +90,11 @@ + if [[ ! -f "$working_dir/.arch-chroot" ]]; then + die "'%s' does not appear to be an Arch chroot." "$working_dir" + elif [[ $(cat "$working_dir/.arch-chroot") != $CHROOT_VERSION ]]; then +- die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" ++ die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" fi build_mount_args diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index c3d5650..767dff8 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -159,7 +159,7 @@ usage() { flag "-r <$(_ 'PATH[:PATH]')>" 'Bind mount a file or directory, read-only' print ' %s options:' libremakepkg flag '-N' "Don't disable networking during build() and - package(). PLEASE don't use this unless you + package(). PLEASE don't use this unless you have a special reason, its use is a violation of Parabola policy." flag '-R' 'Repackage contents of the package without rebuilding' |