From 7b0f2c4c726a6a86bc3a5706a8ed704ddd2ed072 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sun, 23 Jun 1996 10:07:31 +0000
Subject: [PATCH] sync to 0622

---
 src/etc/etc.alpha/MAKEDEV | 28 +++++++---------------------
 src/etc/etc.x68k/MAKEDEV  | 10 ++++++++--
 src/etc/etc.x68k/ttys     |  4 ++--
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 2b8edc1a..aa0c6381 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.4 1996/03/28 18:24:36 niklas Exp $
-#	$NetBSD: MAKEDEV,v 1.8 1996/03/11 19:21:37 cgd Exp $
+#	$OpenBSD: MAKEDEV,v 1.5 1996/06/23 10:07:24 deraadt 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.
 # All rights reserved.
@@ -112,12 +112,13 @@ fd)
 	chmod 666 fd/*
 	;;
 
-sd*|vnd*|ccd*)
+cd*|sd*|vnd*|ccd*)
 	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
 	case $i in
-	sd*) name=sd;	blk=8; chr=8;;
-	vnd*) name=vnd;	blk=9; chr=9;;
-	ccd*) name=ccd; blk=7; chr=27;;
+	cd*)	name=cd;	blk=3; chr=13;;
+	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?
 	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
@@ -219,21 +220,6 @@ ch*)
 	umask 77
 	;;
 
-cd*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	cd*) name=cd;	blk=3; chr=13;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}c	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
-	;;
-
 bpf*)
 	unit=`expr $i : 'bpf\(.*\)'`
 	rm -f bpf$unit
diff --git a/src/etc/etc.x68k/MAKEDEV b/src/etc/etc.x68k/MAKEDEV
index c4b30ecc..3a49cb25 100644
--- a/src/etc/etc.x68k/MAKEDEV
+++ b/src/etc/etc.x68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.1.1.1 1996/05/19 12:35:18 oki 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.
 # 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.1 1996/05/26 10:22:17 deraadt Exp $
+#	$Id: MAKEDEV,v 1.2 1996/06/23 10:07:29 deraadt Exp $
 #
 #	from:
 #	hp300/MAKEDEV (1/15/94), from:
@@ -42,6 +42,7 @@
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
 #		Tries to make the ``standard'' number of each.
+#	floppy	devices to be put on install floppies
 #	fd	makes fd/* for the fdescfs.
 #	std	standard devices
 #	local	configuration specific devices
@@ -102,6 +103,11 @@ all)
 	sh MAKEDEV sram audio pow0 pow1 bell local
 	;;
 
+floppy)
+	sh MAKEDEV std fd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7
+	sh MAKEDEV tty00 cd0 ttye0
+	;;
+
 std)
 	rm -f console drum kmem mem reload null zero tty
 	rm -f klog stdin stdout stderr
diff --git a/src/etc/etc.x68k/ttys b/src/etc/etc.x68k/ttys
index cf142f49..ae6249c6 100644
--- a/src/etc/etc.x68k/ttys
+++ b/src/etc/etc.x68k/ttys
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ttys,v 1.1.1.1 1996/05/19 12:35:21 oki Exp $
+#	$NetBSD: ttys,v 1.1.1.1.4.1 1996/06/17 06:15:19 oki Exp $
 #
 #	from: @(#)ttys	5.1 (Berkeley) 4/17/89
 #
@@ -7,7 +7,7 @@
 #
 # If the console is marked insecure, single-user requires
 # the root password.
-console	"/usr/libexec/getty Pc"		x68k	on secure 
+console	"/usr/libexec/getty Pc"		vt220	on secure 
 tty00	"/usr/libexec/getty std.9600"	unknown off secure	# int. serial.
 #tty00	none			unknown	off secure rtcsts softcar # for dialup ppp.
 tty02	"/usr/libexec/getty std.9600"	unknown off secure	# ext. serial.