summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2009-05-01 01:06:18 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2009-05-01 01:06:18 +0000
commit050a2440f4913a2954b46b92cda6583536971de7 (patch)
tree92714abf5b13aeee9b2d6261b05fccdded7e7ea7 /distrib/miniroot/install.sub
parent9a419054c1b51cde3c9e295e1f101bbb0e584c12 (diff)
Since we no longer give an explicit chance to tweak the fstab used
during upgrade and therein change any normally ro ffs filesystems to rw for the upgrade, just change any ffs filesystems to rw for the upgrade. If we can't trust the upgrade process who can we trust? Diff from RD Thrush.
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub6
1 files changed, 5 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 484385e093a..c35a8593491 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.504 2009/04/30 21:18:29 deraadt Exp $
+# $OpenBSD: install.sub,v 1.505 2009/05/01 01:06:17 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1468,6 +1468,10 @@ munge_fstab() {
# available in the ramdisk kernels.
_opt=$(echo $_opt | sed -e 's/softdep//')
+ # Change read-only ffs to read-write since we'll potentially
+ # write to these filesystems.
+ [[ $_fstype == ffs ]] && _opt=$(echo $_opt | sed -e 's/ro/rw/')
+
# Mount non-ffs filesystems read only.
[[ $_fstype == ffs ]] || _opt=$(echo $_opt | sed -e 's/rw/ro/')