From 3a0232b2c6fed4058a385e7e1f84ee37c284b95a Mon Sep 17 00:00:00 2001 From: niklas <> Date: Wed, 14 May 1997 15:41:26 +0000 Subject: [PATCH] Make svnd nodes too, please test this on your port --- src/etc/etc.alpha/MAKEDEV | 52 ++++++++++++++++++++++++++++++++-- src/etc/etc.amiga/MAKEDEV | 52 ++++++++++++++++++++++++++++++++-- src/etc/etc.arc/MAKEDEV | 52 ++++++++++++++++++++++++++++++++-- src/etc/etc.arm32/MAKEDEV | 36 ++++++++++++++++++++++-- src/etc/etc.atari/MAKEDEV | 50 +++++++++++++++++++++++++++++++-- src/etc/etc.hp300/MAKEDEV | 56 +++++++++++++++++++++++++++++++++---- src/etc/etc.i386/MAKEDEV | 52 ++++++++++++++++++++++++++++++++-- src/etc/etc.mac68k/MAKEDEV | 36 ++++++++++++++++++++++-- src/etc/etc.mvme68k/MAKEDEV | 54 ++++++++++++++++++++++++++++++++--- src/etc/etc.mvme88k/MAKEDEV | 34 ++++++++++++++++++++-- src/etc/etc.pc532/MAKEDEV | 36 ++++++++++++++++++++++-- src/etc/etc.pmax/MAKEDEV | 36 ++++++++++++++++++++++-- src/etc/etc.powerpc/MAKEDEV | 56 +++++++++++++++++++++++++++++++++---- src/etc/etc.sparc/MAKEDEV | 43 ++++++++++++++++++++++++++-- src/etc/etc.sun3/MAKEDEV | 36 ++++++++++++++++++++++-- src/etc/etc.vax/MAKEDEV | 36 ++++++++++++++++++++++-- src/etc/etc.wgrisc/MAKEDEV | 52 ++++++++++++++++++++++++++++++++-- src/etc/etc.x68k/MAKEDEV | 38 ++++++++++++++++++++++--- 18 files changed, 749 insertions(+), 58 deletions(-) diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV index 49804b48..9cf4a6d6 100644 --- a/src/etc/etc.alpha/MAKEDEV +++ b/src/etc/etc.alpha/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.18 1997/05/13 05:34:47 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.19 1997/05/14 15:41:05 niklas Exp $ # $NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -137,12 +137,11 @@ fd) chmod 666 fd/* ;; -sd*|vnd*|ccd*|rd*) +sd*|ccd*|rd*) umask 2 ; unit=`expr $i : '.*d\(.*\)'` case $i in rd*) name=rd; blk=6; chr=28;; sd*) name=sd; blk=8; chr=8;; - vnd*) name=vnd; blk=9; chr=9;; ccd*) name=ccd; blk=7; chr=27;; esac rm -f $name$unit? r$name$unit? @@ -183,6 +182,53 @@ sd*|vnd*|ccd*|rd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=9; chr=9; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + cd*) umask 2 ; unit=`expr $i : '.*cd\(.*\)'` case $i in diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV index 20e46bfb..3a5dc6f6 100644 --- a/src/etc/etc.amiga/MAKEDEV +++ b/src/etc/etc.amiga/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.22 1997/05/13 16:21:48 niklas Exp $ +# $OpenBSD: MAKEDEV,v 1.23 1997/05/14 15:41:07 niklas Exp $ # $NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -214,11 +214,10 @@ fd*) umask 77 ;; -sd*|vnd*|ccd*|wd*) +sd*|ccd*|wd*) umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'` case $i in sd*) name=sd; blk=4; chr=8;; - vnd*) name=vnd; blk=6; chr=19;; ccd*) name=ccd; blk=8; chr=7;; wd*) name=wd; blk=0; chr=37;; esac @@ -267,6 +266,53 @@ sd*|vnd*|ccd*|wd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=6; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + ch*) umask 2 ; unit=`expr $i : '..\(.*\)'` case $i in diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV index 3d9a5f35..2e67db1e 100644 --- a/src/etc/etc.arc/MAKEDEV +++ b/src/etc/etc.arc/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.15 1997/05/13 05:34:49 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.16 1997/05/14 15:41:08 niklas Exp $ # @(#)MAKEDEV 8.1 (Berkeley) 6/9/93 # @@ -167,11 +167,10 @@ bpf*|tun*) # chmod 640 lkm # ;; -fd*|sd*|vnd*|wd*) +fd*|sd*|wd*) umask 2 ; unit=`expr $i : '..\(.*\)'` case $i in sd*) name=sd; blk=0; chr=9;; - vnd*) name=vnd; blk=2; chr=11;; fd*) name=fd; blk=7; chr=13;; wd*) name=wd; blk=4; chr=18;; esac @@ -220,6 +219,53 @@ fd*|sd*|vnd*|wd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=2; chr=11; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + cd*|acd*) umask 2 ; unit=`expr $i : '.*cd\(.*\)'` case $i in diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV index 81113e0e..32fb262b 100644 --- a/src/etc/etc.arm32/MAKEDEV +++ b/src/etc/etc.arm32/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.8 1997/05/13 05:34:50 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.9 1997/05/14 15:41:09 niklas Exp $ # $NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -142,12 +142,11 @@ fd) chmod 666 fd/* ;; -fd*|sd*|vnd*|wd*|ccd*) +fd*|sd*|wd*|ccd*) umask 2 ; unit=`expr $i : '.*d\(.*\)'` case $i in fd*) name=fd; blk=17; chr=17;; sd*) name=sd; blk=24; chr=24;; - vnd*) name=vnd; blk=19; chr=19;; wd*) name=wd; blk=16; chr=16;; ccd*) name=ccd; blk=21; chr=21;; esac @@ -173,6 +172,37 @@ fd*|sd*|vnd*|wd*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=19; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 8 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 8 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 8 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 8 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 8 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 8 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 8 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 8 + $off + 7` + mknod r${name}${unit}a c $chr `expr $unit '*' 8 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 8 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 8 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 8 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 8 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 8 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 8 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 8 + $off + 7` + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + com*|tty*) # (XXX -- com should die) unit=`expr $i : '...\(.*\)'` rm -f com$unit tty0$unit diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV index d5ffa398..f029ee64 100644 --- a/src/etc/etc.atari/MAKEDEV +++ b/src/etc/etc.atari/MAKEDEV @@ -205,11 +205,10 @@ rd0) # Ramdisk, only usefull for boot-floppy umask 77 ;; -sd*|vnd*|ccd*) +sd*|ccd*) umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'` case $i in sd*) name=sd; blk=4; chr=8;; - vnd*) name=vnd; blk=0; chr=17;; ccd*) name=ccd; blk=13; chr=27;; esac rm -f $name$unit? r$name$unit? @@ -257,6 +256,53 @@ sd*|vnd*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=0; chr=17; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + cd*) umask 2 ; unit=`expr $i : '..\(.*\)'` case $i in diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV index 29b6b4da..ec06943d 100644 --- a/src/etc/etc.hp300/MAKEDEV +++ b/src/etc/etc.hp300/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.17 1997/05/13 05:34:51 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.18 1997/05/14 15:41:12 niklas Exp $ # $NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -183,13 +183,12 @@ rd*) umask 77 ;; -ccd*|hd*|sd*|vnd*) +ccd*|hd*|sd*) umask 2 ; unit=`expr $i : '.*d\(.*\)'` case $i in hd*) name=hd; blk=2; chr=9;; sd*) name=sd; blk=4; chr=8;; ccd*) name=ccd; blk=5; chr=17;; - vnd*) name=vnd; blk=6; chr=19;; esac case $unit in 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|\ @@ -227,8 +226,8 @@ ccd*|hd*|sd*|vnd*) mknod r${name}${unit}n c $chr `expr $unit '*' 16 + 13` mknod r${name}${unit}o c $chr `expr $unit '*' 16 + 14` mknod r${name}${unit}p c $chr `expr $unit '*' 16 + 15` - chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] - chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p] + chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p] ;; *) echo bad unit for disk in: $i @@ -237,6 +236,53 @@ ccd*|hd*|sd*|vnd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=6; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + dca*) # XXX What about dca cards? unit=`expr $i : 'dca\(.*\)'` diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV index 9f105014..557d257b 100644 --- a/src/etc/etc.i386/MAKEDEV +++ b/src/etc/etc.i386/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.43 1997/05/13 05:34:52 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.44 1997/05/14 15:41:13 niklas Exp $ # $NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -246,13 +246,12 @@ fd*) umask 77 ;; -ccd*|sd*|vnd*|wd*) +ccd*|sd*|wd*) umask 2 ; unit=`expr $i : '.*d\(.*\)'` case $i in ccd*) name=ccd; blk=16; chr=18;; fd*) name=fd; blk=2; chr=9;; sd*) name=sd; blk=4; chr=13;; - vnd*) name=vnd; blk=14; chr=41;; wd*) name=wd; blk=0; chr=3;; esac rm -f $name$unit? r$name$unit? @@ -293,6 +292,53 @@ ccd*|sd*|vnd*|wd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=14; chr=41; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + tty*) unit=`expr $i : '...\(.*\)'` rm -f com$unit tty$unit cua$unit diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV index 40ac073b..49fce0dd 100644 --- a/src/etc/etc.mac68k/MAKEDEV +++ b/src/etc/etc.mac68k/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.13 1997/05/13 05:34:53 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.14 1997/05/14 15:41:14 niklas Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -132,11 +132,10 @@ fd) chmod 666 fd/* ;; -sd*|vnd*|ccd*) +sd*|ccd*) umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'` case $i in sd*) name=sd; blk=4; chr=13;; - vnd*) name=vnd; blk=8; chr=19;; ccd*) name=ccd; blk=9; chr=20;; esac rm -f $name$unit? r$name$unit? @@ -168,6 +167,37 @@ sd*|vnd*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=8; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 8 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 8 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 8 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 8 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 8 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 8 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 8 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 8 + $off + 7` + mknod r${name}${unit}a c $chr `expr $unit '*' 8 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 8 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 8 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 8 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 8 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 8 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 8 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 8 + $off + 7` + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + tty0*) unit=`expr $i : 'tty0\(.*\)'` rm -f ser${unit} tty${unit} tty0${unit} diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV index 8ed0aea8..af8134e0 100644 --- a/src/etc/etc.mvme68k/MAKEDEV +++ b/src/etc/etc.mvme68k/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.18 1997/05/13 05:34:54 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.19 1997/05/14 15:41:15 niklas Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: MAKEDEV,v 1.18 1997/05/13 05:34:54 millert Exp $ +# $Id: MAKEDEV,v 1.19 1997/05/14 15:41:15 niklas Exp $ # # Device "make" file. Valid arguments: # all makes all known devices, including local devices, @@ -175,11 +175,10 @@ st*) umask 77 ;; -sd*|vnd*|ccd*) +sd*|ccd*) umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'` case $i in sd*) name=sd; blk=4; chr=8;; - vnd*) name=vnd; blk=6; chr=19;; #ccd*) name=ccd; blk=5; chr=7;; esac rm -f $name$unit? r$name$unit? @@ -227,6 +226,53 @@ sd*|vnd*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=6; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + cd*) umask 2 ; unit=`expr $i : '..\(.*\)'` case $i in diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV index 7045e910..91439d15 100644 --- a/src/etc/etc.mvme88k/MAKEDEV +++ b/src/etc/etc.mvme88k/MAKEDEV @@ -120,11 +120,10 @@ ss*) chmod 640 $name$unit n$name$unit ;; -ccd*|sd*|vnd*) +ccd*|sd*) case $i in ccd*) name=ccd; unit=${i#ccd}; blk=5; chr=17;; sd*) name=sd; unit=${i#sd}; blk=4; chr=8;; - vnd*) name=vnd; unit=${i#vnd}; blk=6; chr=19;; esac rm -f $name$unit? r$name$unit? mknod ${name}${unit}a b $blk $(($unit * 8 + 0)) @@ -147,6 +146,37 @@ ccd*|sd*|vnd*) chmod 640 $name$unit? r$name$unit? ;; +vnd*) + umask 2 ; unit=${i#vnd} + for name in vnd svnd; do + blk=6; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk $(($unit * 8 + $off + 0)) + mknod ${name}${unit}b b $blk $(($unit * 8 + $off + 1)) + mknod ${name}${unit}c b $blk $(($unit * 8 + $off + 2)) + mknod ${name}${unit}d b $blk $(($unit * 8 + $off + 3)) + mknod ${name}${unit}e b $blk $(($unit * 8 + $off + 4)) + mknod ${name}${unit}f b $blk $(($unit * 8 + $off + 5)) + mknod ${name}${unit}g b $blk $(($unit * 8 + $off + 6)) + mknod ${name}${unit}h b $blk $(($unit * 8 + $off + 7)) + mknod r${name}${unit}a c $chr $(($unit * 8 + $off + 0)) + mknod r${name}${unit}b c $chr $(($unit * 8 + $off + 1)) + mknod r${name}${unit}c c $chr $(($unit * 8 + $off + 2)) + mknod r${name}${unit}d c $chr $(($unit * 8 + $off + 3)) + mknod r${name}${unit}e c $chr $(($unit * 8 + $off + 4)) + mknod r${name}${unit}f c $chr $(($unit * 8 + $off + 5)) + mknod r${name}${unit}g c $chr $(($unit * 8 + $off + 6)) + mknod r${name}${unit}h c $chr $(($unit * 8 + $off + 7)) + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + pty*) class=${i#pty} case $class in diff --git a/src/etc/etc.pc532/MAKEDEV b/src/etc/etc.pc532/MAKEDEV index 7cb70c8d..ee024e1b 100644 --- a/src/etc/etc.pc532/MAKEDEV +++ b/src/etc/etc.pc532/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.10 1997/05/13 05:34:55 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.11 1997/05/14 15:41:17 niklas Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -114,11 +114,10 @@ rd*) umask 77 ;; -sd*|vnd*|ccd*) +sd*|ccd*) umask 2 ; unit=`expr $i : '.*d\(.*\)'` case $i in sd*) name=sd; blk=0; chr=3;; - vnd*) name=vnd; blk=5; chr=13;; ccd*) name=ccd; blk=6; chr=18;; esac rm -f $name$unit? r$name$unit? @@ -143,6 +142,37 @@ sd*|vnd*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=5; chr=13; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 8 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 8 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 8 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 8 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 8 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 8 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 8 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 8 + $off + 7` + mknod r${name}${unit}a c $chr `expr $unit '*' 8 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 8 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 8 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 8 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 8 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 8 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 8 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 8 + $off + 7` + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + tty*) unit=`expr $i : '...\(.*\)'` mknod tty0$unit c 8 $unit diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV index a574d879..74e65af1 100644 --- a/src/etc/etc.pmax/MAKEDEV +++ b/src/etc/etc.pmax/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.14 1997/05/13 05:34:56 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.15 1997/05/14 15:41:18 niklas Exp $ # @(#)MAKEDEV 8.1 (Berkeley) 6/9/93 # @@ -132,11 +132,10 @@ ipl) # chmod 640 lkm # ;; -rz*|vnd*|vn*|ccd*) +rz*|ccd*) umask 2 ; unit=`expr $i : '.*[dz]\(.*\)'` case $i in rz*) name=rz; blk=21; chr=56;; - vn*) name=vnd; blk=2; chr=11;; ccd*) name=ccd; blk=24; chr=87;; esac case $unit in @@ -167,6 +166,37 @@ rz*|vnd*|vn*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=2; chr=11; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 8 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 8 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 8 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 8 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 8 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 8 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 8 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 8 + $off + 7` + mknod r${name}${unit}a c $chr `expr $unit '*' 8 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 8 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 8 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 8 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 8 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 8 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 8 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 8 + $off + 7` + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + dc*) unit=`expr $i : 'dc\(.*\)'` case $unit in diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV index a5c8f832..a89f7ddb 100644 --- a/src/etc/etc.powerpc/MAKEDEV +++ b/src/etc/etc.powerpc/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.9 1997/05/13 05:34:57 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.10 1997/05/14 15:41:20 niklas Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -129,11 +129,10 @@ fd) chmod 666 fd/* ;; -sd*|vnd*|ccd*) +sd*|ccd*) umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'` case $i in sd*) name=sd; blk=4; chr=13;; - vnd*) name=vnd; blk=14; chr=19;; ccd*) name=ccd; blk=16; chr=20;; esac rm -f $name$unit? r$name$unit? @@ -171,8 +170,8 @@ sd*|vnd*|ccd*) mknod r${name}${unit}n c $chr `expr $unit '*' 16 + 13` mknod r${name}${unit}o c $chr `expr $unit '*' 16 + 14` mknod r${name}${unit}p c $chr `expr $unit '*' 16 + 15` - chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h] - chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p] + chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p] ;; *) echo bad unit for disk in: $i @@ -181,6 +180,53 @@ sd*|vnd*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=14; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + tty0*) unit=`expr $i : 'tty0\(.*\)'` rm -f ser${unit} tty${unit} tty0${unit} diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV index 850cce9c..1b973349 100644 --- a/src/etc/etc.sparc/MAKEDEV +++ b/src/etc/etc.sparc/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.27 1997/05/14 00:11:07 deraadt Exp $ +# $OpenBSD: MAKEDEV,v 1.28 1997/05/14 15:41:21 niklas Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -319,7 +319,7 @@ fd*) umask 77 ;; -ccd*|sd*|xd*|xy*|cd*|vnd*) +ccd*|sd*|xd*|xy*|cd*) umask 2 unit=`unt $i` if [ 0$unit -gt 15 ] @@ -333,7 +333,6 @@ ccd*|sd*|xd*|xy*|cd*|vnd*) xd*) name=xd; blk=10; chr=42;; xy*) name=xy; blk=3; chr=9;; cd*) name=cd; blk=18; chr=58;; - vnd*) name=vnd; blk=8; chr=110;; *) echo bad unit for disk in: $i;; esac if [ "$unit" = "" ] @@ -357,6 +356,44 @@ ccd*|sd*|xd*|xy*|cd*|vnd*) chown root.operator $name$unit? r$name$unit? chmod 640 $name$unit? r$name$unit? umask 77 + ;; + +vnd*) + umask 2 + unit=`unt $i` + if [ 0$unit -gt 15 ] + then + echo bad disk unit: $i - $unit + exit 127 + fi + blk=8; chr=110; + for name in vnd svnd; do + case $name in + vnd) off=0;; + svnd) off=128;; + esac + if [ "$unit" = "" ] + then + n=0 + while [ $n -lt 32 ] + do + sh ${this} $name$n + n=`add $n 1` + done + fi + rm -f $name$unit? r$name$unit? + minor=`mult $unit 16` + minor=`add $minor $off` + for slice in a b c d e f g h i j k l m n o p + do + dev=$name$unit$slice + mknod $dev b $blk $minor + mknod r$dev c $chr $minor + minor=`add $minor 1` + done + chown root.operator $name$unit? r$name$unit? + chmod 640 $name$unit? r$name$unit? + done umask 77 ;; diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV index 03005768..fc4c9cc6 100644 --- a/src/etc/etc.sun3/MAKEDEV +++ b/src/etc/etc.sun3/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.15 1997/05/13 05:34:59 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.16 1997/05/14 15:41:22 niklas Exp $ # $NetBSD: MAKEDEV,v 1.8 1996/03/03 16:54:17 thorpej Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -159,12 +159,11 @@ pty*) done ;; -cd*|sd*|xy*|vnd*|ccd*|rd*) +cd*|sd*|xy*|ccd*|rd*) case $arg in cd*) name=cd; blk=18; chr=58;; sd*) name=sd; blk=7; chr=17;; xy*) name=xy; blk=3; chr=9 ;; - vnd*) name=vnd; blk=5; chr=19;; ccd*) name=ccd; blk=9; chr=33;; rd*) name=rd; blk=13; chr=52;; esac @@ -185,6 +184,37 @@ cd*|sd*|xy*|vnd*|ccd*|rd*) done ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=5; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 8 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 8 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 8 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 8 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 8 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 8 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 8 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 8 + $off + 7` + mknod r${name}${unit}a c $chr `expr $unit '*' 8 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 8 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 8 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 8 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 8 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 8 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 8 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 8 + $off + 7` + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + st*) name=st; blk=11; chr=18; offset=`expr $unit \* 16`; diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV index 6b3b3650..72cc7533 100644 --- a/src/etc/etc.vax/MAKEDEV +++ b/src/etc/etc.vax/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.10 1997/05/13 05:35:00 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.11 1997/05/14 15:41:23 niklas Exp $ # $NetBSD: MAKEDEV,v 1.3 1996/01/07 16:53:15 ragge Exp $ # # @(#)MAKEDEV 8.1 (Berkeley) 6/9/93 @@ -177,7 +177,7 @@ mt*) umask 77 ;; -hp*|hk*|up*|ra*|kra*|rl*|rb*|ccd*|vnd*) +hp*|hk*|up*|ra*|kra*|rl*|rb*|ccd*) umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'` case $i in hp*) name=hp; blk=0; chr=4;; @@ -188,7 +188,6 @@ hp*|hk*|up*|ra*|kra*|rl*|rb*|ccd*|vnd*) rb*) name=rb; blk=11; chr=23;; rl*) name=rl; blk=14; chr=32;; ccd*) name=ccd; blk=17; chr=54;; - vnd*) name=vnd; blk=18; chr=55;; esac case $unit in 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|\ @@ -222,6 +221,37 @@ hp*|hk*|up*|ra*|kra*|rl*|rb*|ccd*|vnd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=18; chr=55; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 8 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 8 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 8 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 8 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 8 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 8 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 8 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 8 + $off + 7` + mknod r${name}${unit}a c $chr `expr $unit '*' 8 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 8 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 8 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 8 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 8 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 8 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 8 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 8 + $off + 7` + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + rx*) unit=`expr $i : '..\(.*\)'` name=rx; chr=30; blk=12; diff --git a/src/etc/etc.wgrisc/MAKEDEV b/src/etc/etc.wgrisc/MAKEDEV index 6010fe4f..0b282c39 100644 --- a/src/etc/etc.wgrisc/MAKEDEV +++ b/src/etc/etc.wgrisc/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.3 1997/05/13 05:35:01 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.4 1997/05/14 15:41:25 niklas Exp $ # @(#)MAKEDEV 8.1 (Berkeley) 6/9/93 # @@ -111,12 +111,11 @@ bpf*|tun*) ;; -cd*|sd*|vnd*) +cd*|sd*) umask 2 ; unit=`expr $i : '..\(.*\)'` case $i in cd*) name=cd; blk=3; chr=8;; sd*) name=sd; blk=0; chr=9;; - vnd*) name=vnd; blk=2; chr=11;; fd*) name=fd; blk=7; chr=13;; esac rm -f $name$unit r$name$unit @@ -164,6 +163,53 @@ cd*|sd*|vnd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=2; chr=11; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 16 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 16 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 16 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 16 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 16 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 16 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 16 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 16 + $off + 7` + mknod ${name}${unit}i b $blk `expr $unit '*' 16 + $off + 8` + mknod ${name}${unit}j b $blk `expr $unit '*' 16 + $off + 9` + mknod ${name}${unit}k b $blk `expr $unit '*' 16 + $off + 10` + mknod ${name}${unit}l b $blk `expr $unit '*' 16 + $off + 11` + mknod ${name}${unit}m b $blk `expr $unit '*' 16 + $off + 12` + mknod ${name}${unit}n b $blk `expr $unit '*' 16 + $off + 13` + mknod ${name}${unit}o b $blk `expr $unit '*' 16 + $off + 14` + mknod ${name}${unit}p b $blk `expr $unit '*' 16 + $off + 15` + mknod r${name}${unit}a c $chr `expr $unit '*' 16 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 16 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 16 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 16 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 16 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 16 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 16 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 16 + $off + 7` + mknod r${name}${unit}i c $chr `expr $unit '*' 16 + $off + 8` + mknod r${name}${unit}j c $chr `expr $unit '*' 16 + $off + 9` + mknod r${name}${unit}k c $chr `expr $unit '*' 16 + $off + 10` + mknod r${name}${unit}l c $chr `expr $unit '*' 16 + $off + 11` + mknod r${name}${unit}m c $chr `expr $unit '*' 16 + $off + 12` + mknod r${name}${unit}n c $chr `expr $unit '*' 16 + $off + 13` + mknod r${name}${unit}o c $chr `expr $unit '*' 16 + $off + 14` + mknod r${name}${unit}p c $chr `expr $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 + umask 77 + ;; + tty*) unit=`expr $i : '...\(.*\)'` rm -f tty$unit cua$unit diff --git a/src/etc/etc.x68k/MAKEDEV b/src/etc/etc.x68k/MAKEDEV index 6f954a8d..299cbcd3 100644 --- a/src/etc/etc.x68k/MAKEDEV +++ b/src/etc/etc.x68k/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.8 1997/05/13 05:35:01 millert Exp $ +# $OpenBSD: MAKEDEV,v 1.9 1997/05/14 15:41:26 niklas Exp $ # $NetBSD: MAKEDEV,v 1.1.1.1.4.1 1996/06/17 02:36:16 oki Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -34,7 +34,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: MAKEDEV,v 1.8 1997/05/13 05:35:01 millert Exp $ +# $Id: MAKEDEV,v 1.9 1997/05/14 15:41:26 niklas Exp $ # # from: # hp300/MAKEDEV (1/15/94), from: @@ -202,11 +202,10 @@ fd*) umask 77 ;; -sd*|vnd*|ccd*) +sd*|ccd*) umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'` case $i in sd*) name=sd; blk=4; chr=8;; - vnd*) name=vnd; blk=6; chr=19;; ccd*) name=ccd; blk=8; chr=7;; esac rm -f $name$unit? r$name$unit? @@ -238,6 +237,37 @@ sd*|vnd*|ccd*) umask 77 ;; +vnd*) + umask 2 ; unit=`expr $i : 'vnd\(.*\)'` + for name in vnd svnd; do + blk=6; chr=19; + case $name in + vnd) off=0;; + svnd) off=128;; + esac + rm -f $name$unit? r$name$unit? + mknod ${name}${unit}a b $blk `expr $unit '*' 8 + $off + 0` + mknod ${name}${unit}b b $blk `expr $unit '*' 8 + $off + 1` + mknod ${name}${unit}c b $blk `expr $unit '*' 8 + $off + 2` + mknod ${name}${unit}d b $blk `expr $unit '*' 8 + $off + 3` + mknod ${name}${unit}e b $blk `expr $unit '*' 8 + $off + 4` + mknod ${name}${unit}f b $blk `expr $unit '*' 8 + $off + 5` + mknod ${name}${unit}g b $blk `expr $unit '*' 8 + $off + 6` + mknod ${name}${unit}h b $blk `expr $unit '*' 8 + $off + 7` + mknod r${name}${unit}a c $chr `expr $unit '*' 8 + $off + 0` + mknod r${name}${unit}b c $chr `expr $unit '*' 8 + $off + 1` + mknod r${name}${unit}c c $chr `expr $unit '*' 8 + $off + 2` + mknod r${name}${unit}d c $chr `expr $unit '*' 8 + $off + 3` + mknod r${name}${unit}e c $chr `expr $unit '*' 8 + $off + 4` + mknod r${name}${unit}f c $chr `expr $unit '*' 8 + $off + 5` + mknod r${name}${unit}g c $chr `expr $unit '*' 8 + $off + 6` + mknod r${name}${unit}h c $chr `expr $unit '*' 8 + $off + 7` + chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h] + chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] + done + umask 77 + ;; + cd*) umask 2 ; unit=`expr $i : '..\(.*\)'` case $i in