summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2021-12-07 04:13:23 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2021-12-07 04:13:23 +0000
commitd77ef8c321bf2b503a475dfe37bb347671b3305f (patch)
tree4b27960dd2b473af3b1ae3f955f3182b0ea61a40 /distrib
parent3150b8a38da181a0f4633e472de717f97b7caf19 (diff)
Two of the umount -f are not neccessary, and only risk leaving
filesystems in bad shape. The other -f are special, and I haven't though through them yet. discussed with florian and tb a while back
Diffstat (limited to 'distrib')
-rw-r--r--distrib/miniroot/install.sub6
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index f686691f01b..893432f6778 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1185 2021/12/02 17:18:39 deraadt Exp $
+# $OpenBSD: install.sub,v 1.1186 2021/12/07 04:13:22 deraadt Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2318,7 +2318,7 @@ is_rootdisk() {
ls -d /mnt/{bin,dev,etc,home,mnt,root,sbin,tmp,usr,var}
fi
_rc=$?
- umount -f /mnt
+ umount /mnt
fi
rm -f /dev/{r,}$_d?
return $_rc
@@ -3301,7 +3301,7 @@ check_unattendedupgrade() {
_rc=$?
((_rc == 0)) && cp /mnt/auto_upgrade.conf /
echo "Which disk is the root disk = ${_d}" >> /auto_upgrade.conf
- umount -f /mnt
+ umount /mnt
fi
rm -f /dev/{r,}$_d?
fi