src - OpenBSD base system

diff options


context:
space:
mode:

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 /etc
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 'etc')

-rw-r--r--

etc/MAKEDEV.common

-rw-r--r--

etc/MAKEDEV.mi

-rw-r--r--

etc/etc.alpha/MAKEDEV

-rw-r--r--

etc/etc.amd64/MAKEDEV

-rw-r--r--

etc/etc.armish/MAKEDEV

-rw-r--r--

etc/etc.aviion/MAKEDEV

-rw-r--r--

etc/etc.hp300/MAKEDEV

-rw-r--r--

etc/etc.hppa/MAKEDEV

-rw-r--r--

etc/etc.hppa64/MAKEDEV

-rw-r--r--

etc/etc.i386/INSTALL.linux

-rw-r--r--

etc/etc.i386/MAKEDEV

-rw-r--r--

etc/etc.landisk/MAKEDEV

-rw-r--r--

etc/etc.loongson/MAKEDEV

-rw-r--r--

etc/etc.luna88k/MAKEDEV

-rw-r--r--

etc/etc.mac68k/MAKEDEV

-rw-r--r--

etc/etc.macppc/MAKEDEV

-rw-r--r--

etc/etc.mvme68k/MAKEDEV

-rw-r--r--

etc/etc.mvme88k/MAKEDEV

-rw-r--r--

etc/etc.mvmeppc/MAKEDEV

-rw-r--r--

etc/etc.mvmeppc/MAKEDEV.md

-rw-r--r--

etc/etc.palm/MAKEDEV

-rw-r--r--

etc/etc.sgi/MAKEDEV

-rw-r--r--

etc/etc.socppc/MAKEDEV

-rw-r--r--

etc/etc.sparc/MAKEDEV

-rw-r--r--

etc/etc.sparc64/MAKEDEV

-rw-r--r--

etc/etc.vax/MAKEDEV

-rw-r--r--

etc/etc.zaurus/MAKEDEV

27 files changed, 80 insertions, 115 deletions

diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common
index 34c73967b42..71d3061a396 100644
--- a/etc/MAKEDEV.common
+++ b/etc/MAKEDEV.common

@@ -1,4 +1,4 @@

-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp $-})dnl

+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp $-})dnl

dnl

@@ -283,8 +283,7 @@ __devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506{-,-} IDE{-,-} ESDI{

__devitem(ccd, ccd*, Concatenated disk devices)dnl

__devitem(raid, raid*, RAIDframe disk devices)dnl

__devitem(vnd, vnd*, quote(file)pseudo-disk devices)dnl

-_mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)

- dodisk svnd $U major_vnd_b major_vnd_c $U 2048{--}ifstep(vnd)-})dnl

+_mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)-})dnl

__devitem(ra, ra*, {-MSCP disks-})dnl

__devitem(hp, hp*, {-MASSBUS disks-})dnl

__devitem(hk, hk*, {-UNIBUS RK06 and RK07 disks-})dnl

diff --git a/etc/MAKEDEV.mi b/etc/MAKEDEV.mi
index c52a32c9c5e..f83e05e57c0 100644
--- a/etc/MAKEDEV.mi
+++ b/etc/MAKEDEV.mi

@@ -1,7 +1,7 @@

define(COMM,`#')dnl

include(MAKEDEV.sub)dnl

dnl

-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp $-})dnl

+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp $-})dnl

dnl

divert(1)dnl

{-#-}

@@ -152,7 +152,7 @@ dnl 2. unit - beginning unit number for block devices

dnl 3. blkmaj - block device major number

dnl 4. chrmaj - character device major number

dnl 5. unit - beginning unit number for character devices

-dnl 6. off - offset from 0 for all minor numbers (see svnd for an example)

+dnl 6. off - offset from 0 for all minor numbers

dnl 7. step - optional, defaults to 16, number of partitions per device

dnl

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 66cfffe80ae..db33de1a77a 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV

@@ -511,7 +511,6 @@ ch*)

vnd*)

dodisk vnd $U 9 9 $U 0

- dodisk svnd $U 9 9 $U 2048

;;

rd*)

diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 074f03a90d4..e96e1e953cc 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV

@@ -542,7 +542,6 @@ ch*)

vnd*)

dodisk vnd $U 14 41 $U 0

- dodisk svnd $U 14 41 $U 2048

;;

rd*)

diff --git a/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index 3c69f6e93ad..63f7df6cb6c 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV

@@ -482,7 +482,6 @@ st*)

vnd*)

dodisk vnd $U 19 19 $U 0

- dodisk svnd $U 19 19 $U 2048

;;

rd*)

diff --git a/etc/etc.aviion/MAKEDEV b/etc/etc.aviion/MAKEDEV
index 033361271b7..80a0a53318d 100644
--- a/etc/etc.aviion/MAKEDEV
+++ b/etc/etc.aviion/MAKEDEV

@@ -320,7 +320,6 @@ ch*)

vnd*)

dodisk vnd $U 8 19 $U 0

- dodisk svnd $U 8 19 $U 2048

;;

rd*)

diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 96b5d3b56ad..952650e0151 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV

@@ -446,7 +446,6 @@ ch*)

vnd*)

dodisk vnd $U 6 19 $U 0

- dodisk svnd $U 6 19 $U 2048

;;

rd*)

diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 336c2f39ede..64d2bebccdc 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV

@@ -459,7 +459,6 @@ ch*)

vnd*)

dodisk vnd $U 2 8 $U 0

- dodisk svnd $U 2 8 $U 2048

;;

rd*)

diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index d5bf84e9437..b217574bf89 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV

@@ -449,7 +449,6 @@ ch*)

vnd*)

dodisk vnd $U 2 8 $U 0

- dodisk svnd $U 2 8 $U 2048

;;

rd*)

diff --git a/etc/etc.i386/INSTALL.linux b/etc/etc.i386/INSTALL.linux
index 85cbfcf3bb1..bded13bd959 100644
--- a/etc/etc.i386/INSTALL.linux
+++ b/etc/etc.i386/INSTALL.linux

@@ -1,4 +1,4 @@

-$OpenBSD: INSTALL.linux,v 1.15 2010/02/22 10:44:07 giovanni Exp $

+$OpenBSD: INSTALL.linux,v 1.16 2011/04/18 16:52:10 thib Exp $

Linux + OpenBSD: it's possible

@@ -55,7 +55,7 @@ contents are unimportant (or whose backups are always up-to-date) next to

the frontier between OpenBSD and Linux. For instance, it's usually a good

idea to locate the swap area such that you can grow or shrink it. Keep in

mind that exceptional usage (very large, temporary swaps) can use a

-temporary file instead of a partition, under both OpenBSD (svnd) and Linux.

+temporary file instead of a partition, under both OpenBSD (vnd) and Linux.

First principles

----------------

diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 0374eb4aba4..4e70e75a910 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV

@@ -553,7 +553,6 @@ ch*)

vnd*)

dodisk vnd $U 14 41 $U 0

- dodisk svnd $U 14 41 $U 2048

;;

rd*)

diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index 941aa3385a9..d9ea517ee08 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV

@@ -458,7 +458,6 @@ st*)

vnd*)

dodisk vnd $U 19 19 $U 0

- dodisk svnd $U 19 19 $U 2048

;;

rd*)

diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index 397dc506ac2..db7e47bcdb3 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV

@@ -442,7 +442,6 @@ ch*)

vnd*)

dodisk vnd $U 2 11 $U 0

- dodisk svnd $U 2 11 $U 2048

;;

rd*)

diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index a8f0d0a4baf..440314b0a91 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV

@@ -354,7 +354,6 @@ ch*)

vnd*)

dodisk vnd $U 8 19 $U 0

- dodisk svnd $U 8 19 $U 2048

;;

rd*)

diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index 4cc5bf3c762..c271c018463 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV

@@ -374,7 +374,6 @@ ch*)

vnd*)

dodisk vnd $U 8 19 $U 0

- dodisk svnd $U 8 19 $U 2048

;;

rd*)

diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 25a7e78f11f..a1b5a65e891 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV

@@ -499,7 +499,6 @@ ch*)

vnd*)

dodisk vnd $U 14 19 $U 0

- dodisk svnd $U 14 19 $U 2048

;;

rd*)

diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index 20337a9b125..dd7aa23038a 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV

@@ -403,7 +403,6 @@ ch*)

vnd*)

dodisk vnd $U 6 19 $U 0

- dodisk svnd $U 6 19 $U 2048

;;

rd*)

diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index 59670b5d486..de7277be151 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV

@@ -358,7 +358,6 @@ ch*)

vnd*)

dodisk vnd $U 8 19 $U 0

- dodisk svnd $U 8 19 $U 2048

;;

rd*)

diff --git a/etc/etc.mvmeppc/MAKEDEV b/etc/etc.mvmeppc/MAKEDEV
index 2a4bff6af7a..2e8fd634263 100644
--- a/etc/etc.mvmeppc/MAKEDEV
+++ b/etc/etc.mvmeppc/MAKEDEV

@@ -1,5 +1,5 @@

#!/bin/sh -

-# $OpenBSD: MAKEDEV,v 1.13 2009/06/03 14:45:40 jj Exp $

+# $OpenBSD: MAKEDEV,v 1.14 2011/04/18 16:52:11 thib Exp $

@@ -268,48 +268,42 @@ sd*|wd*|ccd*|ofdisk*|raid*)

vnd*)

umask 2 ; unit=${i##*[a-z]}

- for name in vnd svnd; do

- blk=14; chr=19;

- case $name in

- vnd) off=0;;

- svnd) off=2048;;

- esac

- rm -f $name$unit? r$name$unit?

- mknod ${name}${unit}a b $blk $(( $unit * 16 + $off + 0 ))

- mknod ${name}${unit}b b $blk $(( $unit * 16 + $off + 1 ))

- mknod ${name}${unit}c b $blk $(( $unit * 16 + $off + 2 ))

- mknod ${name}${unit}d b $blk $(( $unit * 16 + $off + 3 ))

- mknod ${name}${unit}e b $blk $(( $unit * 16 + $off + 4 ))

- mknod ${name}${unit}f b $blk $(( $unit * 16 + $off + 5 ))

- mknod ${name}${unit}g b $blk $(( $unit * 16 + $off + 6 ))

- mknod ${name}${unit}h b $blk $(( $unit * 16 + $off + 7 ))

- mknod ${name}${unit}i b $blk $(( $unit * 16 + $off + 8 ))

- mknod ${name}${unit}j b $blk $(( $unit * 16 + $off + 9 ))

- mknod ${name}${unit}k b $blk $(( $unit * 16 + $off + 10 ))

- mknod ${name}${unit}l b $blk $(( $unit * 16 + $off + 11 ))

- mknod ${name}${unit}m b $blk $(( $unit * 16 + $off + 12 ))

- mknod ${name}${unit}n b $blk $(( $unit * 16 + $off + 13 ))

- mknod ${name}${unit}o b $blk $(( $unit * 16 + $off + 14 ))

- mknod ${name}${unit}p b $blk $(( $unit * 16 + $off + 15 ))

- mknod r${name}${unit}a c $chr $(( $unit * 16 + $off + 0 ))

- mknod r${name}${unit}b c $chr $(( $unit * 16 + $off + 1 ))

- mknod r${name}${unit}c c $chr $(( $unit * 16 + $off + 2 ))

- mknod r${name}${unit}d c $chr $(( $unit * 16 + $off + 3 ))

- mknod r${name}${unit}e c $chr $(( $unit * 16 + $off + 4 ))

- mknod r${name}${unit}f c $chr $(( $unit * 16 + $off + 5 ))

- mknod r${name}${unit}g c $chr $(( $unit * 16 + $off + 6 ))

- mknod r${name}${unit}h c $chr $(( $unit * 16 + $off + 7 ))

- mknod r${name}${unit}i c $chr $(( $unit * 16 + $off + 8 ))

- mknod r${name}${unit}j c $chr $(( $unit * 16 + $off + 9 ))

- mknod r${name}${unit}k c $chr $(( $unit * 16 + $off + 10 ))

- mknod r${name}${unit}l c $chr $(( $unit * 16 + $off + 11 ))

- mknod r${name}${unit}m c $chr $(( $unit * 16 + $off + 12 ))

- mknod r${name}${unit}n c $chr $(( $unit * 16 + $off + 13 ))

- mknod r${name}${unit}o c $chr $(( $unit * 16 + $off + 14 ))

- mknod r${name}${unit}p c $chr $(( $unit * 16 + $off + 15 ))

- chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]

- chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]

- done

+ blk=14; chr=19;

+ rm -f $name$unit? r$name$unit?

+ mknod ${name}${unit}a b $blk $(( $unit * 16 + 0 ))

+ mknod ${name}${unit}b b $blk $(( $unit * 16 + 1 ))

+ mknod ${name}${unit}c b $blk $(( $unit * 16 + 2 ))

+ mknod ${name}${unit}d b $blk $(( $unit * 16 + 3 ))

+ mknod ${name}${unit}e b $blk $(( $unit * 16 + 4 ))

+ mknod ${name}${unit}f b $blk $(( $unit * 16 + 5 ))

+ mknod ${name}${unit}g b $blk $(( $unit * 16 + 6 ))

+ mknod ${name}${unit}h b $blk $(( $unit * 16 + 7 ))

+ mknod ${name}${unit}i b $blk $(( $unit * 16 + 8 ))

+ mknod ${name}${unit}j b $blk $(( $unit * 16 + 9 ))

+ mknod ${name}${unit}k b $blk $(( $unit * 16 + 10 ))

+ mknod ${name}${unit}l b $blk $(( $unit * 16 + 11 ))

+ mknod ${name}${unit}m b $blk $(( $unit * 16 + 12 ))

+ mknod ${name}${unit}n b $blk $(( $unit * 16 + 13 ))

+ mknod ${name}${unit}o b $blk $(( $unit * 16 + 14 ))

+ mknod ${name}${unit}p b $blk $(( $unit * 16 + 15 ))

+ mknod r${name}${unit}a c $chr $(( $unit * 16 + 0 ))

+ mknod r${name}${unit}b c $chr $(( $unit * 16 + 1 ))

+ mknod r${name}${unit}c c $chr $(( $unit * 16 + 2 ))

+ mknod r${name}${unit}d c $chr $(( $unit * 16 + 3 ))

+ mknod r${name}${unit}e c $chr $(( $unit * 16 + 4 ))

+ mknod r${name}${unit}f c $chr $(( $unit * 16 + 5 ))

+ mknod r${name}${unit}g c $chr $(( $unit * 16 + 6 ))

+ mknod r${name}${unit}h c $chr $(( $unit * 16 + 7 ))

+ mknod r${name}${unit}i c $chr $(( $unit * 16 + 8 ))

+ mknod r${name}${unit}j c $chr $(( $unit * 16 + 9 ))

+ mknod r${name}${unit}k c $chr $(( $unit * 16 + 10 ))

+ mknod r${name}${unit}l c $chr $(( $unit * 16 + 11 ))

+ mknod r${name}${unit}m c $chr $(( $unit * 16 + 12 ))

+ mknod r${name}${unit}n c $chr $(( $unit * 16 + 13 ))

+ mknod r${name}${unit}o c $chr $(( $unit * 16 + 14 ))

+ mknod r${name}${unit}p c $chr $(( $unit * 16 + 15 ))

+ chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]

+ chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]

umask 77

;;

diff --git a/etc/etc.mvmeppc/MAKEDEV.md b/etc/etc.mvmeppc/MAKEDEV.md
index 2a687b39d5f..67bad0857f4 100644
--- a/etc/etc.mvmeppc/MAKEDEV.md
+++ b/etc/etc.mvmeppc/MAKEDEV.md

@@ -1,6 +1,6 @@

define(MACHINE,macppc)dnl

vers(__file__,

- {-$OpenBSD: MAKEDEV.md,v 1.34 2010/09/30 15:27:54 claudio Exp $-},

+ {-$OpenBSD: MAKEDEV.md,v 1.35 2011/04/18 16:52:11 thib Exp $-},

etc.MACHINE)dnl

dnl

@@ -118,48 +118,42 @@ sd*|wd*|ccd*|ofdisk*|raid*)

vnd*)

umask 2 ; unit=${i##*[a-z]}

- for name in vnd svnd; do

- blk=14; chr=19;

- case $name in

- vnd) off=0;;

- svnd) off=128;;