mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Drop svnd lines from the munged fstab for upgrades, to avoid confusing

Browse Source 
fsck. Reported by Sebastian Rother via tech@.

"sure" deraadt@
This commit is contained in:
krw 2008-11-11 23:36:13 +00:00
parent 15135fad20
commit 69ee9c011c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/miniroot/install.sub
View File

@ -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* || \