aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2019-01-11 00:39:39 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2019-01-11 00:39:39 -0500
commitcc216920a0867905b9110ef51bf29e576364b175 (patch)
treec39c18b62e59589e3c6608ea6eee99c4618ed796
parent827a047f6fe1a8eff30c6059c8822a4b65665aa9 (diff)
downloadarch-install-scripts-cc216920a0867905b9110ef51bf29e576364b175.tar.bz2
arch-install-scripts-cc216920a0867905b9110ef51bf29e576364b175.tar.xz
arch-install-scripts-cc216920a0867905b9110ef51bf29e576364b175.tar.zst
New upstream version 21upstream/21
-rw-r--r--Makefile2
-rw-r--r--common4
-rw-r--r--genfstab.in2
-rw-r--r--pacstrap.in2
4 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 403744b..7fa638f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VER=20
+VER=21
PREFIX = /usr/local
diff --git a/common b/common
index c3c2bd5..fa040e7 100644
--- a/common
+++ b/common
@@ -2,6 +2,7 @@
declare -A pseudofs_types=([anon_inodefs]=1
[autofs]=1
[bdev]=1
+ [bpf]=1
[binfmt_misc]=1
[cgroup]=1
[cgroup2]=1
@@ -12,6 +13,7 @@ declare -A pseudofs_types=([anon_inodefs]=1
[devpts]=1
[devtmpfs]=1
[dlmfs]=1
+ [efivarfs]=1
[fuse.gvfs-fuse-daemon]=1
[fusectl]=1
[hugetlbfs]=1
@@ -87,7 +89,7 @@ chroot_setup() {
chroot_add_mount udev "$1/dev" -t devtmpfs -o mode=0755,nosuid &&
chroot_add_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec &&
chroot_add_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev &&
- chroot_add_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 &&
+ chroot_add_mount /run "$1/run" --bind &&
chroot_add_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid
}
diff --git a/genfstab.in b/genfstab.in
index 0ebb831..3ff7a14 100644
--- a/genfstab.in
+++ b/genfstab.in
@@ -212,7 +212,7 @@ done
while read -r device type _ _ prio; do
options=defaults
- if [[ $prio != -1 ]]; then
+ if (( prio >= 0 )); then
options+=,pri=$prio
fi
diff --git a/pacstrap.in b/pacstrap.in
index 0c34df4..b0db8ce 100644
--- a/pacstrap.in
+++ b/pacstrap.in
@@ -24,7 +24,7 @@ usage: ${0##*/} [options] root [packages...]
-C config Use an alternate config file for pacman
-c Use the package cache on the host, rather than the target
-G Avoid copying the host's pacman keyring to the target
- -i Prompt for package confirmation when needed
+ -i Prompt for package confirmation when needed (run interactively)
-M Avoid copying the host's mirrorlist to the target
-h Print this help message