update from NetBSD

7 files changed, 174 insertions, 43 deletions

diff --git a/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV
index 62e9654ac86..9aafc78e8f0 100644
--- a/etc/etc.amiga/MAKEDEV
+++ b/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.17 1995/10/09 02:23:07 chopps Exp $
+#	$NetBSD: MAKEDEV,v 1.17.2.1 1995/10/20 10:30:08 chopps Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -335,6 +335,16 @@ grf*)
 		echo bad unit for grf in: $i
 		;;
 	esac
+# for those that need it, also make overlay and image devices:
+	rm -f grfov${unit} grfim${unit}
+	case $unit in
+	4)
+		unitov=`expr $unit + 16`
+		unitim=`expr $unit + 32`
+		mknod grfov${unit} c 10 ${unitov}; chmod 666 grf${unit}
+		mknod grfim${unit} c 10 ${unitim}; chmod 666 grf${unit}
+		;;
+	esac
 	;;
 
 mouse*)
diff --git a/etc/etc.pc532/disktab b/etc/etc.pc532/disktab
index 6f3aa270a80..32ff56b12cd 100644
--- a/etc/etc.pc532/disktab
+++ b/etc/etc.pc532/disktab
@@ -1,4 +1,4 @@
-# $Id: disktab,v 1.1.1.1 1995/10/18 08:38:01 deraadt Exp $
+# $Id: disktab,v 1.2 1995/10/27 23:58:28 deraadt Exp $
 #
 # PC532 version.
 #
@@ -44,9 +44,9 @@ floppy5|5in|5.25in High Density Floppy:\
 
 boot3|3.5in High Density Boot Floppy:\
 	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-	:ta=4.2BSD:pa#2844:oa#0:ba#4096:fa#512:\
+	:ta=4.2BSD:pa#2820:oa#0:ba#4096:fa#512:\
 	:tc=unused:pc#2880:oc#0:\
-	:th=boot:ph#36:oh#2844:
+	:th=boot:ph#60:oh#2820:
 
 rd|2mb ramdisk:\
 	:ty=floppy:se#512:nt#1:rm#8000:ns#256:nc#16:\
diff --git a/etc/etc.pmax/ttys b/etc/etc.pmax/ttys
index ed7d1f5df29..50fb9561420 100644
--- a/etc/etc.pmax/ttys
+++ b/etc/etc.pmax/ttys
@@ -1,6 +1,6 @@
 #
 #	from: @(#)ttys	5.1 (Berkeley) 4/17/89
-#	$Id: ttys,v 1.1.1.1 1995/10/18 08:38:01 deraadt Exp $
+#	$Id: ttys,v 1.2 1995/10/27 23:58:29 deraadt Exp $
 #
 # name	getty				type	status		comments
 #
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index f2bdfd6eb75..642f36a1aac 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -155,16 +155,7 @@ tun*)
 	chown root.wheel tun$unit
 	;;
 
-vnd*)
-	name=vnd; blk=8; chr=110
-	rm -f ${name}${unit}c r${name}${unit}c
-	mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
-	mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
-	chgrp operator ${name}${unit}c r${name}${unit}c
-	chmod 640 ${name}${unit}c r${name}${unit}c
-	;;
-
-ccd*|fd*|sd*|xd*|xy*)
+ccd*|fd*|sd*|xd*|xy*|cd*|vnd*)
 	umask 2
 	case $i in
 	ccd*) name=ccd; blk=9; chr=23;;
@@ -172,10 +163,13 @@ ccd*|fd*|sd*|xd*|xy*)
 	sd*) name=sd; blk=7; chr=17;;
 	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;;
 	esac
 	case $unit in
 	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|\
 	17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)
+		rm -f ${name}${unit}[a-h] r${name}${unit}[a-h]
 		mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
 		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
@@ -240,21 +234,6 @@ ch*)
 	umask 77
 	;;
 
-cd*)
-	umask 2
-	case $i in
-	cd*) name=cd; blk=18; chr=58;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	umask 77
-	;;
-
 lkm)
 	rm -f lkm
 	mknod lkm c 112 0
diff --git a/etc/etc.sparc/disktab b/etc/etc.sparc/disktab
index 959ba851015..f12d6f38763 100644
--- a/etc/etc.sparc/disktab
+++ b/etc/etc.sparc/disktab
@@ -1,7 +1,107 @@
-# $Id: disktab,v 1.2 1995/10/27 23:04:42 deraadt Exp $
-# Sparc has no need for disktab (yet)
+# $Id: disktab,v 1.3 1995/10/27 23:58:31 deraadt Exp $
+#
+#	@(#)disktab	5.5 (Berkeley) 2/27/91
+#
+# Disk geometry and partition layout tables. 
+# Key:
+#	ty	type of disk
+#	ns	#sectors/track
+#	nt	#tracks/cylinder
+#	nc	#cylinders/disk
+#	rm	rpm, 3600 default
+#	se	sector size, 512 default
+#	sf	supports bad144-style bad sector forwarding
+#	so	partition offsets in sectors
+#	p[a-h]	partition sizes in sectors
+#	b[a-h]	partition block sizes in bytes
+#	f[a-h]	partition fragment sizes in bytes
+#
+
+# pseudo-geometry taken from rd7945
+miniroot:\
+        :ty=winchester:ns#16:nt#7:nc#968:\
+	:pa#10240:ba#8192:fa#1024:
+
 floppy|floppy3|3in|3.5in High Density Floppy:\
-        :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-        :pa#2880:oa#0:ba#4096:fa#512:\
-        :pb#2880:ob#0:\
-        :pc#2880:oc#0:
+	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+	:pa#2880:oa#0:ba#4096:fa#512:\
+	:pb#2880:ob#0:\
+	:pc#2880:oc#0:
+
+SUN0104:\
+	:ty=winchester:ns#35:nt#6:nc#974:\
+	:pa#16170:oa#0:ba#8192:fa#1024:\
+	:pb#28140:ob#16170:\
+	:pc#204540:oc#0:bc#4096:fc#1024:\
+	:pg#160230:og#44310:bg#4096:fg#512:
+
+SUN0207:\
+	:ty=winchester:ns#36:nt#9:nc#324:\
+	:pa#33696:oa#0:ba#8192:fa#1024:\
+	:pb#103032:ob#33696:\
+	:pc#406296:oc#0:bc#4096:fc#1024:\
+	:pg#269568:og#136728:bg#4096:fg#1024:
+
+SUN0320:\
+	:ty=winchester:ns#48:nt#14:nc#928:\
+	:pa#43008:oa#0:ba#8192:fa#1024:\
+	:pb#64512:ob#43008:\
+	:pc#623616:oc#0:bc#4096:fc#1024:\
+	:pg#516096:og#107520:bg#4096:fg#1024:
+
+SUN0327:\
+	:ty=winchester:ns#46:nt#9:nc#1545:\
+	:pa#46368:oa#0:ba#8192:fa#1024:\
+	:pb#59616:ob#46368:\
+	:pc#639630:oc#0:bc#4096:fc#1024:\
+	:pg#533646:og#105984:bg#4096:fg#1024:
+
+SUN0424:\
+	:ty=winchester:ns#80:nt#9:nc#1151:\
+	:pa#46080:oa#0:ba#8192:fa#1024:\
+	:pb#69120:ob#46080:\
+	:pc#828720:oc#0:bc#8192:fc#1024:\
+	:pg#713520:og#115200:bg#8192:fg#1024:
+
+SUN0535:\
+	:ty=winchester:ns#80:nt#7:nc#1866:\
+	:pa#44800:oa#0:ba#8192:fa#1024:\
+	:pb#80640:ob#44800:\
+	:pc#1044960:oc#0:bc#8192:fc#1024:\
+	:pg#919520:og#125440:bg#8192:fg#1024:
+
+SUN0669:\
+	:ty=winchester:ns#54:nt#15:nc#1614:\
+	:pa#45360:oa#0:ba#8192:fa#1024:\
+	:pb#84240:ob#45360:\
+	:pc#1307340:oc#0:bc#8192:fc#1024:\
+	:pg#1177740:og#129600:bg#8192:fg#1024:
+
+SUN1.0G:\
+	:ty=winchester:ns#80:nt#15:nc#1703:\
+	:pa#48000:oa#0:ba#8192:fa#1024:\
+	:pb#96000:ob#48000:\
+	:pc#2043600:oc#0:bc#8192:fc#1024:\
+	:pg#1899600:og#144000:bg#8192:fg#1024:
+
+SUN1.05G:\
+	:ty=winchester:ns#72:nt#14:nc#2036:\
+	:pa#48384:oa#0:ba#8192:fa#1024:\
+	:pb#96768:ob#48384:\
+	:pc#2052288:oc#0:bc#8192:fc#1024:\
+	:pg#1907136:og#145152:bg#8192:fg#1024:
+
+SUN1.3G:\
+	:ty=winchester:ns#80:nt#17:nc#1965:\
+	:pa#54400:oa#0:ba#8192:fa#1024:\
+	:pb#97920:ob#54400:\
+	:pc#2672400:oc#0:bc#8192:fc#1024:\
+	:pg#2520080:og#152320:bg#8192:fg#1024:
+
+SUN2.1G:\
+	:ty=winchester:ns#80:nt#19:nc#2733:\
+	:pa#54720:oa#0:ba#8192:fa#1024:\
+	:pb#109440:ob#54720:\
+	:pc#4154160:oc#0:bc#8192:fc#1024:\
+	:pg#3990000:og#164160:bg#8192:fg#1024:
+
diff --git a/etc/mrouted.conf b/etc/mrouted.conf
index 211fbba2b55..443eae27ca0 100644
--- a/etc/mrouted.conf
+++ b/etc/mrouted.conf
@@ -1,14 +1,36 @@
-# $Id: mrouted.conf,v 1.1.1.1 1995/10/18 08:37:56 deraadt Exp $
+#	$NetBSD: mrouted.conf,v 1.1.4.1 1995/10/21 18:10:57 thorpej Exp $
 #
 #   This is the configuration file for "mrouted", an IP multicast router.
 #   mrouted looks for it in "/etc/mrouted.conf".
 #
 #   Command formats:
 #
-#      phyint <local-addr> [disable] [metric <m>] [threshold <t>]
-#      tunnel <local-addr> <remote-addr> [srcrt] [metric <m>] [threshold <t>]
+# name <boundname> <scoped-addr>/<mask-len>
+# cache_lifetime 3600		# seconds
+# pruning on
 #
-#   any phyint commands MUST precede any tunnel commands
+# phyint <local-addr> [disable] [metric <m>] [threshold <t>] [rate_limit <b>]
+#                         [boundary (<boundname>|<scoped-addr>/<mask-len>)]
+#			  [altnet (<subnet>/<mask-len>|<subnet>)]
+# tunnel <local-addr> <remote-addr> [srcrt] [metric <m>] 
+#                                      [threshold <t>] [rate_limit <b>]
+#                         [boundary (<boundname>|<scoped-addr>/<mask-len>)]
 #
-
-tunnel 36.8.0.77 36.2.0.8 metric 3	# <-- EXAMPLE; REPLACE OR DELETE
+#   NOTE: any phyint commands MUST precede any tunnel commands
+#   NOTE: the mask-len is the no. of leading 1's in the mask
+#   NOTE: rate_limit is in kilobits, and defaults to 500 for tunnels
+#
+# Example of named bounary:
+#name LOCAL 239.255.0.0/16
+#name EE 239.254.0.0/16		# i.e. the EE dept wants local groups
+#
+# Example of use of named boundary
+#phyint le1 boundary EE		# le1 is our interface to comp sci,
+#				# keep them away from our local groups
+#
+#
+# Template tunnel for mcast_install
+#	boundary LOCAL
+#
+# You might want to specify a boundary on your tunnel to the outside world,
+# as above.
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 8395e1ee595..7f07386c62b 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,5 +1,5 @@
 #	from: @(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
-#	$Id: 4.4BSD.dist,v 1.1.1.1 1995/10/18 08:38:03 deraadt Exp $
+#	$Id: 4.4BSD.dist,v 1.2 1995/10/27 23:58:33 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -887,6 +887,11 @@ amiga
 # ./usr/share/man/cat4/amiga
 ..
 
+# ./usr/share/man/cat4/atari
+atari
+# ./usr/share/man/cat4/atari
+..
+
 # ./usr/share/man/cat4/hp300
 hp300
 # ./usr/share/man/cat4/hp300
@@ -953,6 +958,11 @@ amiga
 # ./usr/share/man/cat8/amiga
 ..
 
+# ./usr/share/man/cat8/atari
+atari
+# ./usr/share/man/cat8/atari
+..
+
 # ./usr/share/man/cat8/hp300
 hp300
 # ./usr/share/man/cat8/hp300
@@ -1024,6 +1034,11 @@ amiga
 # ./usr/share/man/man4/amiga
 ..
 
+# ./usr/share/man/man4/atari
+atari
+# ./usr/share/man/man4/atari
+..
+
 # ./usr/share/man/man4/hp300
 hp300
 # ./usr/share/man/man4/hp300
@@ -1090,6 +1105,11 @@ amiga
 # ./usr/share/man/man8/amiga
 ..
 
+# ./usr/share/man/man8/atari
+atari
+# ./usr/share/man/man8/atari
+..
+
 # ./usr/share/man/man8/hp300
 hp300
 # ./usr/share/man/man8/hp300