summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2003-10-19 19:07:26 +0000
committerjdolecek <jdolecek@NetBSD.org>2003-10-19 19:07:26 +0000
commit7a46124ea469bfb3daebef6791cff99d5af78ad4 (patch)
tree4501497caf2435d4d3f0436d61293f5e22474f9e
parente43846141a77723ec1e03d5e58494c5d3087b5b1 (diff)
determine the platform number of disk partitions by looking
at MAXPARTITIONS/OLDMAXPARTITIONS in kernel sources, so that it wouldn't need to be specified separately in MAKEDEV.conf change platform MAKEDEV.conf to contain only MD targets and nothing else; simplify the parsing in MAKEDEV.awk accordingly
-rw-r--r--etc/MAKEDEV.awk79
-rw-r--r--etc/etc.acorn26/MAKEDEV.conf5
-rw-r--r--etc/etc.acorn32/MAKEDEV.conf5
-rw-r--r--etc/etc.algor/MAKEDEV.conf5
-rw-r--r--etc/etc.alpha/MAKEDEV.conf5
-rw-r--r--etc/etc.amd64/MAKEDEV.conf5
-rw-r--r--etc/etc.amiga/MAKEDEV.conf5
-rw-r--r--etc/etc.arc/MAKEDEV.conf5
-rw-r--r--etc/etc.atari/MAKEDEV.conf5
-rw-r--r--etc/etc.bebox/MAKEDEV.conf5
-rw-r--r--etc/etc.cats/MAKEDEV.conf5
-rw-r--r--etc/etc.cesfic/MAKEDEV.conf5
-rw-r--r--etc/etc.cobalt/MAKEDEV.conf5
-rw-r--r--etc/etc.dreamcast/MAKEDEV.conf5
-rw-r--r--etc/etc.evbarm/MAKEDEV.conf5
-rw-r--r--etc/etc.evbmips/MAKEDEV.conf5
-rw-r--r--etc/etc.evbppc/MAKEDEV.conf5
-rw-r--r--etc/etc.evbsh3/MAKEDEV.conf5
-rw-r--r--etc/etc.evbsh5/MAKEDEV.conf5
-rw-r--r--etc/etc.hp300/MAKEDEV.conf5
-rw-r--r--etc/etc.hp700/MAKEDEV.conf5
-rw-r--r--etc/etc.hpcarm/MAKEDEV.conf5
-rw-r--r--etc/etc.hpcmips/MAKEDEV.conf5
-rw-r--r--etc/etc.hpcsh/MAKEDEV.conf5
-rw-r--r--etc/etc.i386/MAKEDEV.conf5
-rw-r--r--etc/etc.ibmnws/MAKEDEV.conf5
-rw-r--r--etc/etc.luna68k/MAKEDEV.conf5
-rw-r--r--etc/etc.mac68k/MAKEDEV.conf5
-rw-r--r--etc/etc.macppc/MAKEDEV.conf5
-rw-r--r--etc/etc.mipsco/MAKEDEV.conf5
-rw-r--r--etc/etc.mmeye/MAKEDEV.conf5
-rw-r--r--etc/etc.mvme68k/MAKEDEV.conf5
-rw-r--r--etc/etc.mvmeppc/MAKEDEV.conf5
-rw-r--r--etc/etc.netwinder/MAKEDEV.conf5
-rw-r--r--etc/etc.news68k/MAKEDEV.conf5
-rw-r--r--etc/etc.newsmips/MAKEDEV.conf5
-rw-r--r--etc/etc.next68k/MAKEDEV.conf5
-rw-r--r--etc/etc.ofppc/MAKEDEV.conf5
-rw-r--r--etc/etc.pc532/MAKEDEV.conf5
-rw-r--r--etc/etc.playstation2/MAKEDEV.conf5
-rw-r--r--etc/etc.pmax/MAKEDEV.conf5
-rw-r--r--etc/etc.pmppc/MAKEDEV.conf5
-rw-r--r--etc/etc.prep/MAKEDEV.conf5
-rw-r--r--etc/etc.sandpoint/MAKEDEV.conf5
-rw-r--r--etc/etc.sbmips/MAKEDEV.conf5
-rw-r--r--etc/etc.sgimips/MAKEDEV.conf5
-rw-r--r--etc/etc.shark/MAKEDEV.conf5
-rw-r--r--etc/etc.sparc/MAKEDEV.conf5
-rw-r--r--etc/etc.sparc64/MAKEDEV.conf5
-rw-r--r--etc/etc.sun2/MAKEDEV.conf5
-rw-r--r--etc/etc.sun3/MAKEDEV.conf5
-rw-r--r--etc/etc.vax/MAKEDEV.conf5
-rw-r--r--etc/etc.x68k/MAKEDEV.conf5
53 files changed, 117 insertions, 222 deletions
diff --git a/etc/MAKEDEV.awk b/etc/MAKEDEV.awk
index bcd4c1a0510..c7c86d47cd3 100644
--- a/etc/MAKEDEV.awk
+++ b/etc/MAKEDEV.awk
@@ -1,6 +1,6 @@
#!/usr/bin/awk -
#
-# $NetBSD: MAKEDEV.awk,v 1.4 2003/10/17 19:01:49 jdolecek Exp $
+# $NetBSD: MAKEDEV.awk,v 1.5 2003/10/19 19:07:26 jdolecek Exp $
#
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -91,25 +91,76 @@ BEGIN {
blk[$2] = $4
}
}
+ close(file)
}
- # read MD config file, and determine disk partitions
- # and MD device list
+ # read MD config file for MD device targets
cfgfile = "etc." machine "/MAKEDEV.conf"
+ if (system("test -f '" cfgfile "'") != 0) {
+ print "ERROR: no platform MAKEDEV.conf - '" file "' doesn't exist" > "/dev/stderr"
+ exit 1
+ }
+ # skip first two lines - RCS Id and blank line
+ getline < cfgfile
+ getline < cfgfile
MDDEV = 0 # MD device targets
- MKDISK = "" # routine to create disk devices
while (getline < cfgfile) {
- if ($1 ~ "^DISKPARTITIONS=") {
- sub(".*=[ \t]*", "")
- MKDISK = "makedisk_p" $0
- } else if (MDDEV) {
- if (MDDEV == 1)
- MDDEV = $0
- else
- MDDEV = MDDEV "\n" $0
- } else if ($1 ~ "^MD_DEVICES=")
- MDDEV = 1
+ if (MDDEV)
+ MDDEV = MDDEV "\n" $0
+ else
+ MDDEV = $0
+ }
+ close(cfgfile)
+
+ # determine number of partitions used by platform
+ # there are three variants in tree:
+ # 1. MAXPARTITIONS = 8
+ # 2. MAXPARTITIONS = 16 with no back compat mapping
+ # 3. MAXPARTITIONS = 16 with back compat with old limit of 8
+ # currently all archs, which moved from 8->16 use same
+ # scheme for mapping disk minors, high minor offset
+ # if this changes, the below needs to be adjusted and
+ # additional makedisk_p16foo needs to be added
+ incdir = machine
+ diskpartitions = 0
+ diskbackcompat = 0
+ while (1) {
+ inc = top "arch/" incdir "/include/disklabel.h"
+ if (system("test -f '" inc "'") != 0) {
+ print "ERROR: can't find kernel include file '" inc "'" > "/dev/stderr"
+ exit 1
+ }
+ incdir = 0
+ while (getline < inc) {
+ if ($2 == "MAXPARTITIONS") {
+ # if 8, we are done; otherwise have
+ # to check if it's 16 partitions with
+ # back compat mapping
+ diskpartitions = $3
+ if (diskpartitions == 8)
+ break;
+ } else if ($2 == "OLDMAXPARTITIONS") {
+ diskbackcompat = 1
+ break
+ } else if ($1 == "#include" && $2 ~ "<.*/disklabel.h>"){
+ # wrapper, switch to the right file
+ incdir = substr($2, 2)
+ sub("/.*", "", incdir)
+ break;
+ }
+ }
+
+ if (diskpartitions)
+ break;
+
+ if (!incdir) {
+ print "ERROR: can't determine MAXPARTITIONS from include file '" inc "'" > "/dev/stderr"
+ exit 1
+ }
}
+ MKDISK = "makedisk_p" diskpartitions # routine to create disk devs
+ if (diskbackcompat)
+ MKDISK = MKDISK "high"
# initially no substitutions
devsubst = 0
diff --git a/etc/etc.acorn26/MAKEDEV.conf b/etc/etc.acorn26/MAKEDEV.conf
index d4e30165d84..80d62ecf983 100644
--- a/etc/etc.acorn26/MAKEDEV.conf
+++ b/etc/etc.acorn26/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:26:24 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons
makedev wd0 wd1 sd0 sd1
diff --git a/etc/etc.acorn32/MAKEDEV.conf b/etc/etc.acorn32/MAKEDEV.conf
index 10ee35f4192..da899e3b073 100644
--- a/etc/etc.acorn32/MAKEDEV.conf
+++ b/etc/etc.acorn32/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev tty0 tty1 st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.algor/MAKEDEV.conf b/etc/etc.algor/MAKEDEV.conf
index 80bf705bb96..973baa99d82 100644
--- a/etc/etc.algor/MAKEDEV.conf
+++ b/etc/etc.algor/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:22:42 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 sd3 sd4
makedev st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.alpha/MAKEDEV.conf b/etc/etc.alpha/MAKEDEV.conf
index 623304b51a3..d5240938982 100644
--- a/etc/etc.alpha/MAKEDEV.conf
+++ b/etc/etc.alpha/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:22:42 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 sd3 sd4
makedev st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.amd64/MAKEDEV.conf b/etc/etc.amd64/MAKEDEV.conf
index 7b73a2388d9..628eec4e74c 100644
--- a/etc/etc.amd64/MAKEDEV.conf
+++ b/etc/etc.amd64/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/17 19:22:58 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
# As of 2003-04-17, the "init" case must not create more than 890 entries.
init)
makedev std wscons wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
diff --git a/etc/etc.amiga/MAKEDEV.conf b/etc/etc.amiga/MAKEDEV.conf
index 785c9385958..ea5956af332 100644
--- a/etc/etc.amiga/MAKEDEV.conf
+++ b/etc/etc.amiga/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:24:14 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 fd2 fd3 kbd mouse0 mouse1 par0
makedev lpt0 lpt1 lpt2 lpt3
diff --git a/etc/etc.arc/MAKEDEV.conf b/etc/etc.arc/MAKEDEV.conf
index 4427a4e5ad9..2d2bbf2cd86 100644
--- a/etc/etc.arc/MAKEDEV.conf
+++ b/etc/etc.arc/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:26:24 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 sd3 sd4
makedev st0 st1 ch0 cd0 cd1 vnd0 vnd1 vnd2 vnd3
diff --git a/etc/etc.atari/MAKEDEV.conf b/etc/etc.atari/MAKEDEV.conf
index 344b7828aec..13072f1f2db 100644
--- a/etc/etc.atari/MAKEDEV.conf
+++ b/etc/etc.atari/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:32:13 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:26 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev st0 ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 grf0 grf1
makedev grf2 grf3 grf4 grf5 mouse0 mouse1 rtc etvme leo0
diff --git a/etc/etc.bebox/MAKEDEV.conf b/etc/etc.bebox/MAKEDEV.conf
index ed93491550d..3868fa100f0 100644
--- a/etc/etc.bebox/MAKEDEV.conf
+++ b/etc/etc.bebox/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:22:42 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1
diff --git a/etc/etc.cats/MAKEDEV.conf b/etc/etc.cats/MAKEDEV.conf
index 983847473c4..323768fe827 100644
--- a/etc/etc.cats/MAKEDEV.conf
+++ b/etc/etc.cats/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev tty0 tty1 st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.cesfic/MAKEDEV.conf b/etc/etc.cesfic/MAKEDEV.conf
index 064490b2beb..4edd1ba46d6 100644
--- a/etc/etc.cesfic/MAKEDEV.conf
+++ b/etc/etc.cesfic/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev tty0 tty1
;;
diff --git a/etc/etc.cobalt/MAKEDEV.conf b/etc/etc.cobalt/MAKEDEV.conf
index 4c6243da822..386090abba6 100644
--- a/etc/etc.cobalt/MAKEDEV.conf
+++ b/etc/etc.cobalt/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wd0 wd1 sd0 sd1 sd2 sd3
makedev st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.dreamcast/MAKEDEV.conf b/etc/etc.dreamcast/MAKEDEV.conf
index 4259ceda03a..c1e4147de74 100644
--- a/etc/etc.dreamcast/MAKEDEV.conf
+++ b/etc/etc.dreamcast/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons gdrom0 maple
makedev scif0 sci0
diff --git a/etc/etc.evbarm/MAKEDEV.conf b/etc/etc.evbarm/MAKEDEV.conf
index 0910c1d0fc0..1c48a2efe35 100644
--- a/etc/etc.evbarm/MAKEDEV.conf
+++ b/etc/etc.evbarm/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev tty0 tty1 st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.evbmips/MAKEDEV.conf b/etc/etc.evbmips/MAKEDEV.conf
index 76b44a2b628..09bccb575f8 100644
--- a/etc/etc.evbmips/MAKEDEV.conf
+++ b/etc/etc.evbmips/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:32:13 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 sd3 sd4
makedev st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.evbppc/MAKEDEV.conf b/etc/etc.evbppc/MAKEDEV.conf
index d8b42f5c821..dba14fbd2bc 100644
--- a/etc/etc.evbppc/MAKEDEV.conf
+++ b/etc/etc.evbppc/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1
makedev ss0 ch0 uk0 uk1
diff --git a/etc/etc.evbsh3/MAKEDEV.conf b/etc/etc.evbsh3/MAKEDEV.conf
index b7d51d20e18..282e7c10e13 100644
--- a/etc/etc.evbsh3/MAKEDEV.conf
+++ b/etc/etc.evbsh3/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev fd0
makedev tty0 tty1
diff --git a/etc/etc.evbsh5/MAKEDEV.conf b/etc/etc.evbsh5/MAKEDEV.conf
index b7d51d20e18..282e7c10e13 100644
--- a/etc/etc.evbsh5/MAKEDEV.conf
+++ b/etc/etc.evbsh5/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:32 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev fd0
makedev tty0 tty1
diff --git a/etc/etc.hp300/MAKEDEV.conf b/etc/etc.hp300/MAKEDEV.conf
index f303179d26c..fa71a1f0fef 100644
--- a/etc/etc.hp300/MAKEDEV.conf
+++ b/etc/etc.hp300/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 18:50:35 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev ct0 ct1 rd0 rd1 rd
# makedev wscons # should be after 'std'
diff --git a/etc/etc.hp700/MAKEDEV.conf b/etc/etc.hp700/MAKEDEV.conf
index 4a78a3f2226..69113abfdea 100644
--- a/etc/etc.hp700/MAKEDEV.conf
+++ b/etc/etc.hp700/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev pty1 pty2 pty3
makedev sd0 sd1 sd2 sd3 sd4 sd5 sd6
diff --git a/etc/etc.hpcarm/MAKEDEV.conf b/etc/etc.hpcarm/MAKEDEV.conf
index 870097d93ba..0a61f31ab35 100644
--- a/etc/etc.hpcarm/MAKEDEV.conf
+++ b/etc/etc.hpcarm/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev tty0 tty1 st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.hpcmips/MAKEDEV.conf b/etc/etc.hpcmips/MAKEDEV.conf
index 720f708dfcb..0dd1c448fbb 100644
--- a/etc/etc.hpcmips/MAKEDEV.conf
+++ b/etc/etc.hpcmips/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16high
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1 tty2
diff --git a/etc/etc.hpcsh/MAKEDEV.conf b/etc/etc.hpcsh/MAKEDEV.conf
index be63fc84a13..80fe0c9b015 100644
--- a/etc/etc.hpcsh/MAKEDEV.conf
+++ b/etc/etc.hpcsh/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons wd0 wd1 sd0 sd1
makedev scif0 sci0
diff --git a/etc/etc.i386/MAKEDEV.conf b/etc/etc.i386/MAKEDEV.conf
index cea7e006ab7..6cfcfe83a6d 100644
--- a/etc/etc.i386/MAKEDEV.conf
+++ b/etc/etc.i386/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16high
-
-MD_DEVICES=
# As of 2003-04-17, the "init" case must not create more than 890 entries.
init)
makedev std wscons wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
diff --git a/etc/etc.ibmnws/MAKEDEV.conf b/etc/etc.ibmnws/MAKEDEV.conf
index a9562eb040b..2e41c271305 100644
--- a/etc/etc.ibmnws/MAKEDEV.conf
+++ b/etc/etc.ibmnws/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/19 17:06:30 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1
diff --git a/etc/etc.luna68k/MAKEDEV.conf b/etc/etc.luna68k/MAKEDEV.conf
index 7239d98cab3..6bb170eefe7 100644
--- a/etc/etc.luna68k/MAKEDEV.conf
+++ b/etc/etc.luna68k/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:29:08 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev ttya sd0 st0
makedev wscons
diff --git a/etc/etc.mac68k/MAKEDEV.conf b/etc/etc.mac68k/MAKEDEV.conf
index 4adf9d4900d..4f9c8000b64 100644
--- a/etc/etc.mac68k/MAKEDEV.conf
+++ b/etc/etc.mac68k/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 sd3 wd0 wd1 wd2 wd3 tty0 tty1
makedev st0 st1 ch0 cd0 cd1 fd0 fd1
diff --git a/etc/etc.macppc/MAKEDEV.conf b/etc/etc.macppc/MAKEDEV.conf
index e074a6258bf..a5aefb30c94 100644
--- a/etc/etc.macppc/MAKEDEV.conf
+++ b/etc/etc.macppc/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1
makedev ss0 ch0 uk0 uk1
diff --git a/etc/etc.mipsco/MAKEDEV.conf b/etc/etc.mipsco/MAKEDEV.conf
index f2bedc9f2c6..d4b29bc585c 100644
--- a/etc/etc.mipsco/MAKEDEV.conf
+++ b/etc/etc.mipsco/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev sd0 sd1 sd2 sd3 cd0 st0 st1
makedev tty0 tty1
diff --git a/etc/etc.mmeye/MAKEDEV.conf b/etc/etc.mmeye/MAKEDEV.conf
index e2dedad9321..36f418afca6 100644
--- a/etc/etc.mmeye/MAKEDEV.conf
+++ b/etc/etc.mmeye/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1
diff --git a/etc/etc.mvme68k/MAKEDEV.conf b/etc/etc.mvme68k/MAKEDEV.conf
index 756a7c642e7..72965d94ffc 100644
--- a/etc/etc.mvme68k/MAKEDEV.conf
+++ b/etc/etc.mvme68k/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev sd0 sd1 sd2
makedev ttyZ1 ttyZ2 ttyZ3 ttyC1 ttyC2 ttyC3
diff --git a/etc/etc.mvmeppc/MAKEDEV.conf b/etc/etc.mvmeppc/MAKEDEV.conf
index 84d590a7230..ac827db5f84 100644
--- a/etc/etc.mvmeppc/MAKEDEV.conf
+++ b/etc/etc.mvmeppc/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:30:35 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1
diff --git a/etc/etc.netwinder/MAKEDEV.conf b/etc/etc.netwinder/MAKEDEV.conf
index 127dee3d1a7..2e0fa6950b7 100644
--- a/etc/etc.netwinder/MAKEDEV.conf
+++ b/etc/etc.netwinder/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev tty0 tty1 st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.news68k/MAKEDEV.conf b/etc/etc.news68k/MAKEDEV.conf
index 66b7aac8d7f..14781e8e380 100644
--- a/etc/etc.news68k/MAKEDEV.conf
+++ b/etc/etc.news68k/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev sd0 sd1 sd2 sd3 cd0 st0 st1
makedev tty0 tty1
diff --git a/etc/etc.newsmips/MAKEDEV.conf b/etc/etc.newsmips/MAKEDEV.conf
index eb84dbb4b12..c7d162327f3 100644
--- a/etc/etc.newsmips/MAKEDEV.conf
+++ b/etc/etc.newsmips/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 sd3 cd0 st0 st1
makedev tty0 tty1
diff --git a/etc/etc.next68k/MAKEDEV.conf b/etc/etc.next68k/MAKEDEV.conf
index 3da0fb2ef56..53f82070bea 100644
--- a/etc/etc.next68k/MAKEDEV.conf
+++ b/etc/etc.next68k/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 sd3 tty0 tty1
makedev st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.ofppc/MAKEDEV.conf b/etc/etc.ofppc/MAKEDEV.conf
index bc692d2840d..9f276f75753 100644
--- a/etc/etc.ofppc/MAKEDEV.conf
+++ b/etc/etc.ofppc/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1
makedev ss0 ch0 uk0 uk1
diff --git a/etc/etc.pc532/MAKEDEV.conf b/etc/etc.pc532/MAKEDEV.conf
index 14e30b34375..bd4c61a3a39 100644
--- a/etc/etc.pc532/MAKEDEV.conf
+++ b/etc/etc.pc532/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
makedev tty0 tty1 tty2 tty3 tty4 tty5 tty6 tty7
diff --git a/etc/etc.playstation2/MAKEDEV.conf b/etc/etc.playstation2/MAKEDEV.conf
index b801d50e357..f11f7b416f7 100644
--- a/etc/etc.playstation2/MAKEDEV.conf
+++ b/etc/etc.playstation2/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wscons wd0 wd1
makedev usbs
diff --git a/etc/etc.pmax/MAKEDEV.conf b/etc/etc.pmax/MAKEDEV.conf
index 867175fe352..a5130ced745 100644
--- a/etc/etc.pmax/MAKEDEV.conf
+++ b/etc/etc.pmax/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:27 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev minimal
makedev fb0 fb1 fb2
diff --git a/etc/etc.pmppc/MAKEDEV.conf b/etc/etc.pmppc/MAKEDEV.conf
index 9d7e48884bf..1871276e507 100644
--- a/etc/etc.pmppc/MAKEDEV.conf
+++ b/etc/etc.pmppc/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:29:08 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1
diff --git a/etc/etc.prep/MAKEDEV.conf b/etc/etc.prep/MAKEDEV.conf
index 48671ba6495..eda66247891 100644
--- a/etc/etc.prep/MAKEDEV.conf
+++ b/etc/etc.prep/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:30:35 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1
diff --git a/etc/etc.sandpoint/MAKEDEV.conf b/etc/etc.sandpoint/MAKEDEV.conf
index 43e33fc7a69..7d45cb1718a 100644
--- a/etc/etc.sandpoint/MAKEDEV.conf
+++ b/etc/etc.sandpoint/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:29:08 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
makedev tty0 tty1
diff --git a/etc/etc.sbmips/MAKEDEV.conf b/etc/etc.sbmips/MAKEDEV.conf
index e93e735f4bc..5228b9f4348 100644
--- a/etc/etc.sbmips/MAKEDEV.conf
+++ b/etc/etc.sbmips/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=16high
-
-MD_DEVICES=
all_md)
makedev wd0 wd1 sd0 sd1 sd2 sd3
makedev st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.sgimips/MAKEDEV.conf b/etc/etc.sgimips/MAKEDEV.conf
index 1eafe9bb2f6..5e17e63aaef 100644
--- a/etc/etc.sgimips/MAKEDEV.conf
+++ b/etc/etc.sgimips/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=16
-
-MD_DEVICES=
all_md)
makedev wd0 wd1 sd0 sd1 sd2 sd3
makedev st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.shark/MAKEDEV.conf b/etc/etc.shark/MAKEDEV.conf
index 5e230cdd60d..c90759473f8 100644
--- a/etc/etc.shark/MAKEDEV.conf
+++ b/etc/etc.shark/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:22:42 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev tty0 tty1 st0 st1 ch0 cd0 cd1
diff --git a/etc/etc.sparc/MAKEDEV.conf b/etc/etc.sparc/MAKEDEV.conf
index 5908cbdbd6b..528d4a4c29e 100644
--- a/etc/etc.sparc/MAKEDEV.conf
+++ b/etc/etc.sparc/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:22:42 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev ttya ttyb ttyc ttyd
makedev sd0 sd1 sd2 sd3 sd4 xd0 xd1 xd2 xd3 xy0 xy1 xy2 xy3
diff --git a/etc/etc.sparc64/MAKEDEV.conf b/etc/etc.sparc64/MAKEDEV.conf
index 50dd81ee22f..58228396443 100644
--- a/etc/etc.sparc64/MAKEDEV.conf
+++ b/etc/etc.sparc64/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 17:22:42 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev ttya ttyb ttyc ttyd ttyC00 ttyC01 ttyh0 ttyh1
makedev sd0 sd1 sd2 sd3 sd4 ss0 ch0 uk0 uk1
diff --git a/etc/etc.sun2/MAKEDEV.conf b/etc/etc.sun2/MAKEDEV.conf
index ad62dea7595..ec0b4058c44 100644
--- a/etc/etc.sun2/MAKEDEV.conf
+++ b/etc/etc.sun2/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:33 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev bwtwo0 cgtwo0
makedev sd0 sd1 sd2 sd3 sd4 sd5 sd6
diff --git a/etc/etc.sun3/MAKEDEV.conf b/etc/etc.sun3/MAKEDEV.conf
index a770f623262..792ee8cc803 100644
--- a/etc/etc.sun3/MAKEDEV.conf
+++ b/etc/etc.sun3/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:34 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev bwtwo0 cgtwo0 cgfour0
makedev sd0 sd1 sd2 sd3 sd4 sd5 sd6
diff --git a/etc/etc.vax/MAKEDEV.conf b/etc/etc.vax/MAKEDEV.conf
index 7219cdffa27..9cd946a2b78 100644
--- a/etc/etc.vax/MAKEDEV.conf
+++ b/etc/etc.vax/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:34 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
makedev ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 sd0 sd1 sd2 sd3 rd0 rd1 rd2
diff --git a/etc/etc.x68k/MAKEDEV.conf b/etc/etc.x68k/MAKEDEV.conf
index 59e2b694bae..81af459211c 100644
--- a/etc/etc.x68k/MAKEDEV.conf
+++ b/etc/etc.x68k/MAKEDEV.conf
@@ -1,8 +1,5 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2003/10/15 19:13:34 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2003/10/19 19:07:28 jdolecek Exp $
-DISKPARTITIONS=8
-
-MD_DEVICES=
all_md)
makedev st0 st1 ttye0 ttye1 mouse0 mouse1
makedev tty00 tty01 tty02 tty03 com0 com1 grf0 grf1 kbd