From 64bb46311547cb5ea13d3d8f7d0d1836f33a68f5 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Fri, 5 Aug 2022 18:06:23 -0400
Subject: New upstream version 26.

---
 arch-chroot.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'arch-chroot.in')

diff --git a/arch-chroot.in b/arch-chroot.in
index bcb38df..3bf6523 100644
--- a/arch-chroot.in
+++ b/arch-chroot.in
@@ -5,7 +5,7 @@ shopt -s extglob
 m4_include(common)
 
 setup=chroot_setup
-unshare="$root_unshare"
+unshare=0
 
 usage() {
   cat <<EOF
@@ -82,7 +82,7 @@ while getopts ':hNu:' flag; do
       ;;
     N)
       setup=unshare_setup
-      unshare="$user_unshare"
+      unshare=1
       ;;
     u)
       userspec=$OPTARG
@@ -116,8 +116,12 @@ arch-chroot() {
   chroot_args=()
   [[ $userspec ]] && chroot_args+=(--userspec "$userspec")
 
-  SHELL=/bin/bash chroot "${chroot_args[@]}" -- "$chrootdir" "${args[@]}"
+  SHELL=/bin/bash $pid_unshare chroot "${chroot_args[@]}" -- "$chrootdir" "${args[@]}"
 }
 
 args=("$@")
-$unshare bash -c "$(declare_all); arch-chroot"
+if (( unshare )); then
+  $mount_unshare bash -c "$(declare_all); arch-chroot"
+else
+  arch-chroot
+fi
-- 
cgit v1.2.3