From 9ccd063afaa7a2c9ee9e666294691e2f802e30fc Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 27 May 1996 07:51:27 +0000
Subject: [PATCH] sync

---
 src/etc/etc.amiga/MAKEDEV   | 12 ++++++------
 src/etc/etc.amiga/ttys      |  5 +++--
 src/etc/etc.arm32/disktab   |  2 ++
 src/etc/etc.mvme68k/disktab | 12 ++++++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index 690ea005..8c37eaa9 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.7 1996/05/09 06:55:51 niklas Exp $
-#	$NetBSD: MAKEDEV,v 1.20 1996/04/13 01:02:18 veego Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 1996/05/27 07:51:23 deraadt Exp $
+#	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -108,8 +108,8 @@ all)
 
 floppy)
 	sh MAKEDEV std kbd pty0 tty00 ttyA0 ttyA1 tun0 tun1
-	sh MAKEDEV grf0 grf1 grf2 grf3 grf4 grf5
-	sh MAKEDEV ttye0 ttye1 ttye2 ttye3 ttye4 ttye5
+	sh MAKEDEV grf0 grf1 grf2 grf3 grf4 grf5 grf6
+	sh MAKEDEV ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 ttye6
 	sh MAKEDEV cd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 st0
 	sh MAKEDEV fd0 fd1 fd2 fd3 
 	;;
@@ -327,7 +327,7 @@ ttye*)
 	rm -f ttye${unit}
 	rm -f ite*
 	case $unit in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		mknod ttye${unit} c 13 ${unit}
 		;;
 	*)
@@ -340,7 +340,7 @@ grf*)
 	unit=`expr $i : 'grf\(.*\)'`
 	rm -f grf${unit}
 	case $unit in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		mknod grf${unit} c 10 ${unit}; chmod 666 grf${unit}
 		;;
 	*)
diff --git a/src/etc/etc.amiga/ttys b/src/etc/etc.amiga/ttys
index af2c6b1a..eed64c2b 100644
--- a/src/etc/etc.amiga/ttys
+++ b/src/etc/etc.amiga/ttys
@@ -1,6 +1,6 @@
 #
-#	$OpenBSD: ttys,v 1.3 1996/05/09 07:05:21 niklas Exp $
-#	$NetBSD: ttys,v 1.12 1996/03/02 13:58:06 veego Exp $
+#	$OpenBSD: ttys,v 1.4 1996/05/27 07:51:25 deraadt Exp $
+#	$NetBSD: ttys,v 1.13 1996/05/19 21:03:55 veego Exp $
 #
 #	from: @(#)ttys	5.1 (Berkeley) 4/17/89
 #
@@ -15,6 +15,7 @@ ttye2	"/usr/libexec/getty Pc"		vt220	on secure 	# retina
 ttye3	"/usr/libexec/getty Pc"		vt220	on secure 	# cirrus logic
 ttye4	"/usr/libexec/getty Pc"		vt220	on secure 	# a2410
 ttye5	"/usr/libexec/getty Pc"		vt220	on secure 	# CyberVision64
+ttye6	"/usr/libexec/getty Pc"		vt220	on secure 	# Domino, Merlin, oMniBus
 tty00	"/usr/libexec/getty std.9600"	unknown off secure	# int. serial
 ttyB0	"/usr/libexec/getty std.9600"	unknown off secure	# ISA serial
 ttyB1	"/usr/libexec/getty std.9600"	unknown off secure	# ISA serial
diff --git a/src/etc/etc.arm32/disktab b/src/etc/etc.arm32/disktab
index 1949dfe8..9a223be9 100644
--- a/src/etc/etc.arm32/disktab
+++ b/src/etc/etc.arm32/disktab
@@ -1,3 +1,5 @@
+# $NetBSD: disktab,v 1.2 1996/05/07 20:33:54 mark Exp $
+#
 # Disk geometry and partition layout tables. 
 # Key:
 #	dt	controller type
diff --git a/src/etc/etc.mvme68k/disktab b/src/etc/etc.mvme68k/disktab
index 2de79dec..90b9914c 100644
--- a/src/etc/etc.mvme68k/disktab
+++ b/src/etc/etc.mvme68k/disktab
@@ -22,3 +22,15 @@
 # Entries may also be used for other compatible drives
 # with the same geometry.
 
+#
+# XXX - Would like :ba#4096:fa#512: but that panics...
+# Leave nc=16; adjust size using: ns
+rdroot|ramdiskroot|RAM-disk root FS image:\
+	:ty=simulated:se#512:nc#16:nt#2:ns#16:\
+	:ta=4.4BSD:oa#0:pa#512:\
+	:ob#0:pb#0:oc#0:pc#512:
+miniroot|Installation root-on-swap FS image:\
+	:ty=simulated:se#512:ns#32:nt#8:nc#64:\
+	:ta=4.4BSD:oa#0:pa#16384:\
+	:ob#0:pb#0:oc#0:pc#16384:
+