aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2021-08-11 18:42:40 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2021-08-11 18:42:40 -0400
commita895e76831f95063674a03cd13d153bcc94212b6 (patch)
tree7cceb6c15abe2ecbed01453e43cfe78d475d5d79
parente60738a060ea0bb6e532b69add05db7b697462af (diff)
parentf922fa446f9893e571bf038c5e2d2520837c9814 (diff)
downloadarch-install-scripts-a895e76831f95063674a03cd13d153bcc94212b6.tar.bz2
arch-install-scripts-a895e76831f95063674a03cd13d153bcc94212b6.tar.xz
arch-install-scripts-a895e76831f95063674a03cd13d153bcc94212b6.tar.zst
Update upstream source from tag 'upstream/24'
Update to upstream version '24' with Debian dir 593973476c4a6f4d1408593dbeaa4a01ea8129a2
-rw-r--r--Makefile2
-rw-r--r--completion/arch-chroot.bash6
-rw-r--r--doc/arch-chroot.8.asciidoc2
-rw-r--r--doc/genfstab.8.asciidoc2
-rw-r--r--doc/pacstrap.8.asciidoc5
-rw-r--r--genfstab.in28
6 files changed, 20 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index 301eb7e..50f319a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VER=23
+VER=24
PREFIX = /usr/local
diff --git a/completion/arch-chroot.bash b/completion/arch-chroot.bash
index 37fbf7c..707208a 100644
--- a/completion/arch-chroot.bash
+++ b/completion/arch-chroot.bash
@@ -1,9 +1,7 @@
_arch_chroot() {
compopt +o dirnames
- local cur prev opts
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
+ local cur prev opts i
+ _init_completion -n : || return
opts="-u -h"
for i in "${COMP_WORDS[@]:1:COMP_CWORD-1}"; do
diff --git a/doc/arch-chroot.8.asciidoc b/doc/arch-chroot.8.asciidoc
index ada7d40..5586a46 100644
--- a/doc/arch-chroot.8.asciidoc
+++ b/doc/arch-chroot.8.asciidoc
@@ -41,6 +41,6 @@ Options
See Also
--------
-linkman:pacman[1]
+linkman:pacman[8]
include::footer.asciidoc[]
diff --git a/doc/genfstab.8.asciidoc b/doc/genfstab.8.asciidoc
index 73faa4e..7542cea 100644
--- a/doc/genfstab.8.asciidoc
+++ b/doc/genfstab.8.asciidoc
@@ -45,6 +45,6 @@ Options
See Also
--------
-linkman:pacman[1]
+linkman:pacman[8]
include::footer.asciidoc[]
diff --git a/doc/pacstrap.8.asciidoc b/doc/pacstrap.8.asciidoc
index c23e8ca..d3d517c 100644
--- a/doc/pacstrap.8.asciidoc
+++ b/doc/pacstrap.8.asciidoc
@@ -16,7 +16,8 @@ specified packages will be installed into a given directory after setting up
some basic mountpoints. By default, the host system's pacman signing keys
and mirrorlist will be used to seed the chroot.
-If no packages are specified to be installed, the 'base' group will be installed.
+If no packages are specified to be installed, the 'base' metapackage will be
+installed.
Options
-------
@@ -46,6 +47,6 @@ Options
See Also
--------
-linkman:pacman[1]
+linkman:pacman[8]
include::footer.asciidoc[]
diff --git a/genfstab.in b/genfstab.in
index c626290..6a2ad10 100644
--- a/genfstab.in
+++ b/genfstab.in
@@ -163,23 +163,19 @@ findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root" |
pass=0
fi
- if [[ $fsroot != / ]]; then
- if [[ $fstype = btrfs ]]; then
- opts+=,subvol=${fsroot#/}
- else
- # it's a bind mount
- src=$(findmnt -funcevo TARGET "$src")$fsroot
- if [[ $src -ef $target ]]; then
- # hrmm, this is weird. we're probably looking at a file or directory
- # that was bound into a chroot from the host machine. Ignore it,
- # because this won't actually be a valid mount. Worst case, the user
- # just re-adds it.
- continue
- fi
- fstype=none
- opts+=,bind
- pass=0
+ if [[ $fsroot != / && $fstype != btrfs ]]; then
+ # it's a bind mount
+ src=$(findmnt -funcevo TARGET "$src")$fsroot
+ if [[ $src -ef $target ]]; then
+ # hrmm, this is weird. we're probably looking at a file or directory
+ # that was bound into a chroot from the host machine. Ignore it,
+ # because this won't actually be a valid mount. Worst case, the user
+ # just re-adds it.
+ continue
fi
+ fstype=none
+ opts+=,bind
+ pass=0
fi
# filesystem quirks