summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2017-01-16 19:12:36 +0000
committerbluhm <bluhm@openbsd.org>2017-01-16 19:12:36 +0000
commit2f1fadf8479ca21f0220703cd73dcf9ccedf9dd0 (patch)
tree316bb3a09ccff533e475cfa6c9065e1304e39925
parentLet it compile with debugging enabled (diff)
downloadwireguard-openbsd-2f1fadf8479ca21f0220703cd73dcf9ccedf9dd0.tar.xz
wireguard-openbsd-2f1fadf8479ca21f0220703cd73dcf9ccedf9dd0.zip
SIGTERM does not reliably terminate mountd(8), use -KILL for cleanup.
-rw-r--r--regress/sys/ffs/nfs/Makefile4
-rw-r--r--regress/sys/nfs/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/regress/sys/ffs/nfs/Makefile b/regress/sys/ffs/nfs/Makefile
index ad5258beae3..1ab1e976415 100644
--- a/regress/sys/ffs/nfs/Makefile
+++ b/regress/sys/ffs/nfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2017/01/13 01:19:13 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 2017/01/16 19:12:36 bluhm Exp $
TESTS= chflags chmod chown link mkdir mkfifo open rename rmdir \
symlink truncate unlink
@@ -27,7 +27,7 @@ mount: disk nfs
unconfig:
-umount -f -t nfs -h 127.0.0.1 -a
-rmdir /mnt/regress-nfs-client 2>/dev/null || true
- -pkill mountd || true
+ -pkill -KILL mountd || true
-rcctl -f stop nfsd
-rcctl -f stop portmap
-umount -f /dev/vnd0c 2>/dev/null || true
diff --git a/regress/sys/nfs/Makefile b/regress/sys/nfs/Makefile
index 7036de5407b..2765145ab16 100644
--- a/regress/sys/nfs/Makefile
+++ b/regress/sys/nfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/01/13 01:33:14 bluhm Exp $
+# $OpenBSD: Makefile,v 1.3 2017/01/16 19:12:36 bluhm Exp $
PROGS= mmap-sysctl-copyin mmap-sysctl-copyout
OBJS= ${PROGS:S/$/.o/}
@@ -27,7 +27,7 @@ mount: disk nfs
unconfig:
-umount -f -t nfs -h 127.0.0.1 -a
-rmdir /mnt/regress-nfs-client 2>/dev/null || true
- -pkill mountd || true
+ -pkill -KILL mountd || true
-rcctl -f stop nfsd
-rcctl -f stop portmap
-umount -f /dev/vnd0c 2>/dev/null || true