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/sgi/cdfs | |
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/sgi/cdfs')
-rw-r--r-- | distrib/sgi/cdfs/Makefile | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index 70d37e2c127..f1c64750fbc 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/03/31 19:44:33 miod Exp $ +# $OpenBSD: Makefile,v 1.11 2011/04/18 16:52:10 thib Exp $ TOP= ${.CURDIR}/.. @@ -15,10 +15,10 @@ ${CDROM}: -rm -rf ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/ dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=${CDFSMB} - vnconfig -v -c svnd0 ${.OBJDIR}/${FFS} - disklabel -w svnd0 minicdroot "OpenBSD/sgi " - newfs /dev/rsvnd0a - mount /dev/svnd0a ${.OBJDIR}/cd-dir + vnconfig -v -c vnd0 ${.OBJDIR}/${FFS} + disklabel -w vnd0 minicdroot "OpenBSD/sgi " + newfs /dev/rvnd0a + mount /dev/vnd0a ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/${OSrev}/sgi gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP27 > \ ${.OBJDIR}/cd-dir/bsd.IP27 @@ -38,17 +38,17 @@ ${CDROM}: cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32 cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/cd-dir/boot64 umount ${.OBJDIR}/cd-dir - @df /dev/svnd0a - vnconfig -u svnd0 + @df /dev/vnd0a + vnconfig -u vnd0 dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=`expr ${CDFSMB} + 2` - vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} + vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM} # boot32 needs 77, boot64 needs 173, and add some room for growth - /usr/mdec/sgivol -i -h 320 svnd0 > ${.OBJDIR}/volhdr - /usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 svnd0 - /usr/mdec/sgivol -l boot32 sashARCS svnd0 - /usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 svnd0 - /usr/mdec/sgivol -l boot64 sash64 svnd0 - vnconfig -u svnd0 + /usr/mdec/sgivol -i -h 320 vnd0 > ${.OBJDIR}/volhdr + /usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 vnd0 + /usr/mdec/sgivol -l boot32 sashARCS vnd0 + /usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 vnd0 + /usr/mdec/sgivol -l boot64 sash64 vnd0 + vnconfig -u vnd0 dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 \ seek=`cat ${.OBJDIR}/volhdr | grep 'Volume Header' | awk '{print $$3}'` @@ -60,7 +60,7 @@ install: unconfig: -umount /mnt -umount ${.OBJDIR}/cd-dir - -vnconfig -u svnd0 + -vnconfig -u vnd0 clean cleandir: /bin/rm -f ${CDROM} ${FFS} volhdr |