diff options
| author |   Unit 193 <unit193@unit193.net> | 2022-08-05 18:06:24 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2022-08-05 18:06:24 -0400 |
| commit | e0b06ff704a19dadee4e73887bd225a35e864ad5 (patch) | |
| tree | 31bd115e6a07043483c59db1984e52a86ff5f9ae /pacstrap.in | |
| parent | 3f6e3062bfec066b4af21fc19a2c906ce5c757e2 (diff) | |
| parent | 64bb46311547cb5ea13d3d8f7d0d1836f33a68f5 (diff) | |
Update upstream source from tag 'upstream/26'
Update to upstream version '26'
with Debian dir 99b018b2286e84a419731a347b93bce98f900ad2
Diffstat (limited to 'pacstrap.in')
| -rw-r--r-- | pacstrap.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pacstrap.in b/pacstrap.in index 9ffe17c..b1cfb09 100644 --- a/pacstrap.in +++ b/pacstrap.in @@ -17,7 +17,7 @@ copykeyring=1 copymirrorlist=1 pacmode=-Sy setup=chroot_setup -unshare="$root_unshare" +unshare=0 usage() { cat <<EOF @@ -67,7 +67,7 @@ while getopts ':C:cdGiMNU' flag; do ;; N) setup=unshare_setup - unshare="$user_unshare" + unshare=1 ;; U) pacmode=-U @@ -120,7 +120,7 @@ pacstrap() { fi msg 'Installing packages to %s' "$newroot" - if ! pacman -r "$newroot" $pacmode "${pacman_args[@]}"; then + if ! $pid_unshare pacman -r "$newroot" $pacmode "${pacman_args[@]}"; then die 'Failed to install packages to new root' fi @@ -130,6 +130,10 @@ pacstrap() { fi } -$unshare bash -c "$(declare_all); pacstrap" +if (( unshare )); then + $mount_unshare bash -c "$(declare_all); pacstrap" +else + pacstrap +fi # vim: et ts=2 sw=2 ft=sh: |