diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2011-04-18 16:52:13 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2011-04-18 16:52:13 +0000 |
| commit | 4514e243d14cd40603dffb605323e3402ec21b23 (patch) | |
| tree | d4b13011d6019799589fc50473b797e4aa5e0b3d /distrib/miniroot | |
| parent | af2f7b02e557188dfe5a424132f1b18dcd36c6fd (diff) | |
Deprecate vnds in favour of svnds.
In effect, this removes the "old" vndX nodes, and renames
the svndX nodes to vndX.
Old svndX nodes will still continue to work though, for now.
Cleanup accordingly.
ok deraadt@, todd@
comments and ok on the man page bits from jmc@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/Makefile | 4 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index a06951c13de..9a0848a857c 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2010/10/18 04:07:48 deraadt Exp $ +# $OpenBSD: Makefile,v 1.33 2011/04/18 16:52:10 thib Exp $ REV= ${OSrev} @@ -14,7 +14,7 @@ ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot UTILS= ${.CURDIR} MOUNT_POINT?= /mnt -VND?= svnd0 +VND?= vnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a DISKTYPE= miniroot diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 8b1df75fd03..4122abda841 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.637 2011/04/17 20:57:10 krw Exp $ +# $OpenBSD: install.sub,v 1.638 2011/04/18 16:52:10 thib 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 @@ -1630,7 +1630,7 @@ install_sets() { # 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), -# 5) are on a svnd device. +# 5) are on a vnd device. # # In addition, # @@ -1645,7 +1645,7 @@ munge_fstab() { while read _dev _mp _fstype _opt _rest; do # Drop irrelevant lines and filesystems. - [[ $_dev == @(/dev/svnd*|\#*) || \ + [[ $_dev == @(/dev/vnd*|\#*) || \ $_fstype == nfs || \ ! -f /sbin/mount_$_fstype || \ $_opt == *noauto* || \ |