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/alpha | |
| 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/alpha')
| -rw-r--r-- | distrib/alpha/bsd.rd/Makefile | 4 | ||||
| -rw-r--r-- | distrib/alpha/cdfs/Makefile | 12 | ||||
| -rw-r--r-- | distrib/alpha/common/Makefile.inc | 4 | ||||
| -rw-r--r-- | distrib/alpha/iso/Makefile | 12 |
4 files changed, 16 insertions, 16 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index 7498f85b5ca..50c0af31935 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2011/04/15 03:11:22 deraadt Exp $ +# $OpenBSD: Makefile,v 1.18 2011/04/18 16:52:09 thib Exp $ TOP= ${.CURDIR}/.. @@ -7,7 +7,7 @@ IMAGE= ramdisk${REV}.fs MOUNT_POINT= /mnt -VND?= svnd0 +VND?= vnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a VND_CRDEV= /dev/r${VND}c diff --git a/distrib/alpha/cdfs/Makefile b/distrib/alpha/cdfs/Makefile index 5854ab1b886..e5703464f18 100644 --- a/distrib/alpha/cdfs/Makefile +++ b/distrib/alpha/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/08/26 01:35:44 krw Exp $ +# $OpenBSD: Makefile,v 1.8 2011/04/18 16:52:09 thib Exp $ TOP= ${.CURDIR}/.. @@ -27,14 +27,14 @@ ${CDROM}: -p "Theo de Raadt <deraadt@openbsd.org>" \ -V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \ ${.OBJDIR}/cd-dir 2>&1) | tee log - vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} - mount -t cd9660 /dev/svnd0a /mnt + vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM} + mount -t cd9660 /dev/vnd0a /mnt /usr/mdec/installboot -v \ -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \ -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \ - /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c + /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rvnd0c umount /mnt - vnconfig -u svnd0 + vnconfig -u vnd0 .ifdef RELEASEDIR install: @@ -47,7 +47,7 @@ clean cleandir: unconfig: -umount /mnt - -vnconfig -u svnd0 + -vnconfig -u vnd0 .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc index ff55ab6479f..f8c81a62bca 100644 --- a/distrib/alpha/common/Makefile.inc +++ b/distrib/alpha/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.22 2011/04/15 03:11:22 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.23 2011/04/18 16:52:09 thib Exp $ TOP= ${.CURDIR}/.. @@ -7,7 +7,7 @@ IMAGE= ramdisk${REV}.fs MOUNT_POINT= /mnt -VND?= svnd0 +VND?= vnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a VND_CRDEV= /dev/r${VND}c diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile index 5f29c94ed98..5cd903f2046 100644 --- a/distrib/alpha/iso/Makefile +++ b/distrib/alpha/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 05:40:47 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2011/04/18 16:52:09 thib Exp $ TOP= ${.CURDIR}/.. @@ -39,14 +39,14 @@ ${CDROM}: ${BASE} ${XBASE} -p "Theo de Raadt <deraadt@openbsd.org>" \ -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \ ${.OBJDIR}/cd-dir 2>&1) | tee log - vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} - mount -t cd9660 /dev/svnd0a /mnt + vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM} + mount -t cd9660 /dev/vnd0a /mnt /usr/mdec/installboot -v \ -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \ -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \ - /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c + /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rvnd0c umount /mnt - vnconfig -u svnd0 + vnconfig -u vnd0 install: cp ${CDROM} ${RELDIR}/ @@ -62,7 +62,7 @@ clean cleandir: unconfig: -umount /mnt - -vnconfig -u svnd0 + -vnconfig -u vnd0 .include <bsd.obj.mk> .include <bsd.subdir.mk> |