summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-09-16 15:35:05 +0000
committerkrw <krw@openbsd.org>2016-09-16 15:35:05 +0000
commit846ca98ba6008528b08e4f94c419ae988a25fe8b (patch)
tree6c16353cdedd1c9b4f911266022c8b46a51b0dd0
parentSwap watermarks from high (4096) to low (128) when we get full buffers (diff)
downloadwireguard-openbsd-846ca98ba6008528b08e4f94c419ae988a25fe8b.tar.xz
wireguard-openbsd-846ca98ba6008528b08e4f94c419ae988a25fe8b.zip
Revert last. -f is a bad bad idea here.
ok deraadt@
-rw-r--r--distrib/miniroot/install.sub4
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 9284dced571..8947bd9c54d 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.919 2016/09/16 13:28:20 krw Exp $
+# $OpenBSD: install.sub,v 1.920 2016/09/16 15:35:05 krw Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2737,7 +2737,7 @@ do_upgrade(){
check_fs
# Mount filesystems in /etc/fstab.
- umount -f /mnt || { echo "Can't umount $ROOTDEV!"; exit; }
+ umount /mnt || { echo "Can't umount $ROOTDEV!"; exit; }
mount_fs
# Feed the random pool some entropy before we read from it.