diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-11-11 23:36:14 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-11-11 23:36:14 +0000 |
| commit | 5d2fa792ab3dd27826851593780c6bb32333b418 (patch) | |
| tree | 1828da1e99b74c2850154a7ba381536b76f02078 | |
| parent | e2c9af9ae9cffcad67d0c6845a64bf54ca71a713 (diff) | |
Drop svnd lines from the munged fstab for upgrades, to avoid confusing
fsck. Reported by Sebastian Rother via tech@.
"sure" deraadt@
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 495f5e1bc72..5847f6ecfb4 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.439 2008/11/11 00:55:21 krw Exp $ +# $OpenBSD: install.sub,v 1.440 2008/11/11 23:36:13 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback @@ -1357,7 +1357,8 @@ install_sets() { # 1) can't be mounted (no mount_* command is found), # 2) have 'xx' in the option field (usually /altroot), # 3) have 'noauto' in the option field, -# 4) are nfs (since name resolution may not be present). +# 4) are nfs (since name resolution may not be present), +# 5) are on a svnd device. # # In addition, # @@ -1373,7 +1374,7 @@ munge_fstab() { while read _dev _mp _fstype _opt _rest; do # Drop irrelevant lines and filesystems. - [[ $_dev == \#* || \ + [[ $_dev == @(/dev/svnd*|\#*) || \ $_fstype == nfs || \ ! -f /sbin/mount_$_fstype || \ $_opt == *noauto* || \ |