diff options
| author |   kn <kn@openbsd.org> | 2019-02-10 21:11:42 +0000 |
|---|---|---|
| committer | kn <kn@openbsd.org> | 2019-02-10 21:11:42 +0000 |
| commit | 1afb3ec235d7de18310ae92fd8633f2e212383fd (patch) | |
| tree | 4a08de2c49dc4c164320047bce3cb45301ca64c5 /libexec/reorder_kernel | |
| parent | missed a file. add flags to the pool page free function. (diff) | |
| download | wireguard-openbsd-1afb3ec235d7de18310ae92fd8633f2e212383fd.tar.xz wireguard-openbsd-1afb3ec235d7de18310ae92fd8633f2e212383fd.zip | |
Simplify NFS check
Instead of getting all filesystems with df(1), filter /usr/share/ and check
with mount(1) whether it's NFS, make df error out directly if the
filesystem type matches nfs.
OK sthen tb
Diffstat (limited to 'libexec/reorder_kernel')
| -rw-r--r-- | libexec/reorder_kernel/reorder_kernel.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libexec/reorder_kernel/reorder_kernel.sh b/libexec/reorder_kernel/reorder_kernel.sh index ee14f7a096c..d8b8a2d24a0 100644 --- a/libexec/reorder_kernel/reorder_kernel.sh +++ b/libexec/reorder_kernel/reorder_kernel.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: reorder_kernel.sh,v 1.5 2018/05/01 09:45:39 rpe Exp $ +# $OpenBSD: reorder_kernel.sh,v 1.6 2019/02/10 21:11:42 kn Exp $ # # Copyright (c) 2017 Robert Peichaer <rpe@openbsd.org> # @@ -21,8 +21,7 @@ set -o errexit export PATH=/bin:/sbin:/usr/bin:/usr/sbin # Skip if /usr/share is on a nfs mounted filesystem. -DISK_DEV=$(df /usr/share | sed '1d;s/ .*//') -[[ $(mount | grep "^$DISK_DEV") == *" type nfs "* ]] && exit 1 +df -t nfs /usr/share >/dev/null 2>&1 && exit 1 KERNEL=$(sysctl -n kern.osversion) KERNEL=${KERNEL%#*} |