From 625e6bd41206c5018b1a9e11c5cc2b3aef55a66e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 10 May 2014 22:22:05 -0400
Subject: mkarchroot: Correct "Usage:" text.

The "app" hasn't been an option since arch-nspawn was created.
---
 mkarchroot.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkarchroot.in')

diff --git a/mkarchroot.in b/mkarchroot.in
index fb472bc..5f3d6fe 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -15,7 +15,7 @@ CHROOT_VERSION='v3'
 working_dir=''
 
 usage() {
-	echo "Usage: ${0##*/} [options] working-dir [package-list | app]"
+	echo "Usage: ${0##*/} [options] working-dir package-list..."
 	echo ' options:'
 	echo '    -C <file>     Location of a pacman config file'
 	echo '    -M <file>     Location of a makepkg config file'
-- 
cgit v1.2.3-2-g168b


From bf7dc83bab4f002a29866fd30b1574b6fbca36aa Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sun, 19 Oct 2014 16:06:31 -0400
Subject: save and reuse original argv when auto-elevating

Fixes FS#42277.
---
 mkarchroot.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mkarchroot.in')

diff --git a/mkarchroot.in b/mkarchroot.in
index 5f3d6fe..78384da 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -24,6 +24,8 @@ usage() {
 	exit 1
 }
 
+orig_argv=("$@")
+
 while getopts 'hC:M:c:' arg; do
 	case "$arg" in
 		C) pac_conf="$OPTARG" ;;
@@ -37,7 +39,7 @@ shift $(($OPTIND - 1))
 
 (( $# < 2 )) && die 'You must specify a directory and one or more packages.'
 
-check_root "$0" "$@"
+check_root "$0" "${orig_argv[@]}"
 
 working_dir="$(readlink -f $1)"
 shift 1
-- 
cgit v1.2.3-2-g168b