From 781cf3aa0d3f9a93d84481833f5c83aa9ee68ac0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Tue, 28 Aug 2018 19:52:15 -0400
Subject: New upstream version 19

---
 Makefile       | 12 ++----------
 arch-chroot.in |  5 +++--
 genfstab.in    |  8 +++++++-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 6824f3f..fd2be13 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VER=18
+VER=19
 
 PREFIX = /usr/local
 
@@ -32,12 +32,4 @@ install: all
 	install -m755 $(BINPROGS) $(DESTDIR)$(PREFIX)/bin
 	install -Dm644 zsh-completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_archinstallscripts
 
-uninstall:
-	for f in $(BINPROGS); do $(RM) $(DESTDIR)$(PREFIX)/bin/$$f; done
-	$(RM) $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_archinstallscripts
-
-dist:
-	git archive --format=tar --prefix=arch-install-scripts-$(VER)/ v$(VER) | gzip -9 > arch-install-scripts-$(VER).tar.gz
-	gpg --detach-sign --use-agent arch-install-scripts-$(VER).tar.gz
-
-.PHONY: all clean install uninstall dist
+.PHONY: all clean install uninstall
diff --git a/arch-chroot.in b/arch-chroot.in
index a954953..bfb83a3 100644
--- a/arch-chroot.in
+++ b/arch-chroot.in
@@ -19,6 +19,8 @@ EOF
 chroot_add_resolv_conf() {
   local chrootdir=$1 resolv_conf=$1/etc/resolv.conf
 
+  [[ -e /etc/resolv.conf ]] || return 0
+
   # Handle resolv.conf as a symlink to somewhere else.
   if [[ -L $chrootdir/etc/resolv.conf ]]; then
     # readlink(1) should always give us *something* since we know at this point
@@ -73,6 +75,5 @@ chroot_add_resolv_conf "$chrootdir" || die "failed to setup resolv.conf"
 
 chroot_args=()
 [[ $userspec ]] && chroot_args+=(--userspec "$userspec")
-chroot_args+=("$chrootdir" "$@")
 
-SHELL=/bin/bash unshare --fork --pid chroot "${chroot_args[@]}"
+SHELL=/bin/bash unshare --fork --pid chroot "${chroot_args[@]}" -- "$chrootdir" "$@"
diff --git a/genfstab.in b/genfstab.in
index 1e8a2c8..7663522 100644
--- a/genfstab.in
+++ b/genfstab.in
@@ -79,6 +79,7 @@ usage() {
 usage: ${0##*/} [options] root
 
   Options:
+    -f FILTER      Restrict output to mountpoints matching the prefix FILTER
     -L             Use labels for source identifiers (shortcut for -t LABEL)
     -p             Exclude pseudofs mounts (default behavior)
     -P             Include pseudofs mounts
@@ -98,7 +99,7 @@ if [[ -z $1 || $1 = @(-h|--help) ]]; then
   exit $(( $# ? 0 : 1 ))
 fi
 
-while getopts ':LPpt:U' flag; do
+while getopts ':f:LPpt:U' flag; do
   case $flag in
     L)
       bytag=LABEL
@@ -106,6 +107,9 @@ while getopts ':LPpt:U' flag; do
     U)
       bytag=UUID
       ;;
+    f)
+      prefixfilter=$OPTARG
+      ;;
     P)
       pseudofs=1
       ;;
@@ -139,6 +143,8 @@ findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root" |
     continue
   fi
 
+  [[ $target = "$prefixfilter"* ]] || continue
+
   # default 5th and 6th columns
   dump=0 pass=2
 
-- 
cgit v1.2.3