summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2002-06-10 23:03:33 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2002-06-10 23:03:33 +0000
commit32bd120e6d450297ab48b3a73d3bf306ad15e3a1 (patch)
treee26b63112a769e9df7915d5a3a7cd55a3699d188 /distrib/miniroot/install.sub
parent0ab8d7cfae74191d2831457b55a5c48a4588775d (diff)
Be more paranoid about option fiddling in munge_fs, in case someone
ever adds an option with a name too similar to the name of the one being manipulated. Only softdep at the moment but some more option fiddling coming.
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub5
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 596de0269ff..d3a84b59f75 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.230 2002/06/10 22:38:12 krw Exp $
+# $OpenBSD: install.sub,v 1.231 2002/06/10 23:03:32 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1848,7 +1848,8 @@ munge_fstab() {
esac
# Don't use soft updates
- _opt="$(echo ${_opt} | sed 's/,softdep,/,/; s/,softdep//; s/softdep,//')"
+ _opt="$(echo ${_opt} | \
+ sed -e 's/^softdep$//; s/^softdep,//; s/,softdep,/,/; s/,softdep$//;')"
if [ "$_mp" = "/" ]; then
_mp=