Administrative changes for aviion, ok deraadt@

src/etc/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.232 2006/01/04 20:38:59 miod Exp $
+#	$OpenBSD: Makefile,v 1.233 2006/05/09 21:17:13 miod Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -21,8 +21,8 @@ BIN1=	changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
 	moduli pf.os sensorsd.conf ifstated.conf
 
-.if ${MACHINE} != "mvme68k" && ${MACHINE} != "mvme88k" && \
-    ${MACHINE} != "vax"
+.if ${MACHINE} != "aviion" && ${MACHINE} != "mvme68k" && \
+    ${MACHINE} != "mvme88k" && ${MACHINE} != "vax"
 BIN1+=	wsconsctl.conf
 .endif
 
@@ -328,6 +328,7 @@ snap_md:
 
 MAKEDEVARCHS+= alpha
 MAKEDEVARCHS+= amd64
+MAKEDEVARCHS+= aviion
 MAKEDEVARCHS+= cats
 MAKEDEVARCHS+= hp300
 MAKEDEVARCHS+= hppa
@@ -378,7 +379,7 @@ distrib:
 DHSIZE=1024 1536 2048 3072 4096
 update-moduli:
 	( \
-		echo '#    $$OpenBSD: Makefile,v 1.232 2006/01/04 20:38:59 miod Exp $$'; \
+		echo '#    $$OpenBSD: Makefile,v 1.233 2006/05/09 21:17:13 miod Exp $$'; \
 		echo '# Time Type Tests Tries Size Generator Modulus'; \
 		( for i in ${DHSIZE}; do \
 			ssh-keygen -b $$i -G /dev/stdout; \

src/etc/etc.aviion/MAKEDEV.md

@@ -0,0 +1,103 @@
+vers(__file__,
+	{-$OpenBSD: MAKEDEV.md,v 1.1 2006/05/09 21:17:13 miod Exp $-},
+etc.MACHINE)dnl
+dnl
+dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
+dnl
+dnl Permission to use, copy, modify, and distribute this software for any
+dnl purpose with or without fee is hereby granted, provided that the above
+dnl copyright notice and this permission notice appear in all copies.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl
+dnl *** mvme88k-specific devices
+dnl
+__devitem(dart, ttya-c, on-board serial and mouse ports)dnl
+_mkdev(dart, {-tty[a-c]-}, {-u=${i#tty*}
+	case $u in
+	a) n=0 ;;
+	b) n=1 ;;
+	c) n=2 ;;
+	*) echo unknown tty device $i ;;
+	esac
+	case $u in
+	a|b|c)
+		M tty$u c major_dart_c $n 660 dialer uucp
+		M cua$u c major_dart_c Add($n, 128) 660 dialer uucp
+		;;
+	esac-})dnl
+__devitem(nvram, nvram0, On-board non-volatile memory)dnl
+_mkdev(nvram, nvram0, {-M nvram0 c major_nvram_c 0 640 kmem-})dnl
+dnl
+dnl *** MAKEDEV itself
+dnl
+_TITLE(make)
+dnl
+dnl all)
+dnl
+target(all, nvram, 0)dnl
+dnl
+target(all, ch, 0)dnl
+target(all, ss, 0)dnl
+target(all, xfs, 0)dnl
+target(all, pty, 0)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, uk, 0)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+twrget(all, dart, tty, a, b, c)dnl
+_DEV(all)
+dnl
+dnl ramdisk)
+dnl
+twrget(ramd, dart, tty, a)dnl
+target(ramd, pty, 0)dnl
+_DEV(ramd)
+dnl
+_DEV(std)
+_DEV(local)
+dnl
+_TITLE(dis)
+_DEV(ccd, 17, 9)
+_DEV(cd, 9, 6)
+_DEV(rd, 18, 7)
+_DEV(sd, 8, 4)
+_DEV(vnd, 19, 8)
+_TITLE(tap)
+_DEV(ch, 44)
+_DEV(st, 20, 5)
+_TITLE(term)
+_DEV(dart, 12)
+_TITLE(pty)
+_DEV(ptm, 52)
+_DEV(pty, 5)
+_DEV(tty, 4)
+_TITLE(spec)
+_DEV(bpf, 22)
+_DEV(fdesc, 21)
+_DEV(lkm, 24)
+_DEV(nvram, 10)
+_DEV(pf, 39)
+_DEV(rnd, 40)
+_DEV(ss, 42)
+_DEV(systrace, 50)
+_DEV(tun, 23)
+_DEV(uk, 41)
+_DEV(xfs, 51)
+dnl
+divert(__mddivert)dnl
+dnl
+_std(1, 2, 43, 3, 6)
+	;;
+

src/etc/etc.aviion/Makefile.inc

@@ -0,0 +1,19 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2006/05/09 21:17:13 miod Exp $
+#	etc.aviion/Makefile.inc -- aviion-specific etc Makefile targets
+
+.ifdef DESTDIR
+snap_md: bsd-generic bootblocks distrib
+	cp ${.CURDIR}/../sys/arch/aviion/compile/GENERIC/bsd \
+	    ${DESTDIR}/snapshot/bsd
+
+bsd-generic:
+	cd ${.CURDIR}/../sys/arch/aviion/conf && config GENERIC
+	cd ${.CURDIR}/../sys/arch/aviion/compile/GENERIC && \
+	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
+
+bootblocks:
+	cp ${DESTDIR}/usr/mdec/* ${DESTDIR}/snapshot/
+
+.PHONY: bsd-generic bootblocks
+
+.endif	# DESTDIR check

src/etc/etc.aviion/disktab

@@ -0,0 +1,38 @@
+#	$OpenBSD: disktab,v 1.1 2006/05/09 21:17:13 miod 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-p]	partition sizes in sectors
+#	b[a-p]	partition block sizes in bytes
+#	f[a-p]	partition fragment sizes in bytes
+#
+# All partition sizes contain space
+# for bad sector tables unless the
+# device drivers fail to support this.
+#
+# 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#128:\
+	:ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096\
+	:ob#0:pb#0:oc#0:pc#4096:
+miniroot|Installation root-on-swap FS image:\
+	:ty=simulated:se#512:ns#32:nt#8:nc#64:\
+	:ta=4.2BSD:oa#0:pa#16384:\
+	:ob#0:pb#0:oc#0:pc#16384:
+

src/etc/etc.aviion/fbtab

@@ -0,0 +1 @@
+/dev/ttya	0600	/dev/console

src/etc/etc.aviion/ttys

@@ -0,0 +1,11 @@
+#
+#	$OpenBSD: ttys,v 1.1 2006/05/09 21:17:13 miod Exp $
+#
+# name	getty				type	status		comments
+#
+# If the console is marked insecure, single-user requires
+# the root password.
+console	"/usr/libexec/getty Pc"		unknown	on   secure
+# on-board serial ports (ttyb is the mouse port)
+ttya	"/usr/libexec/getty Pc"		unknown	off  secure	# console
+ttyc	"/usr/libexec/getty Pc"		unknown	off

src/etc/mtree/4.4BSD.dist

@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.179 2006/02/19 23:45:01 millert Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.180 2006/05/09 21:17:13 miod Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1462,6 +1462,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1537,6 +1539,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1585,6 +1589,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1628,6 +1634,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1681,6 +1689,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1724,6 +1734,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1767,6 +1779,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1810,6 +1824,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 i386
@@ -1827,6 +1843,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1875,6 +1893,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1918,6 +1938,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -1971,6 +1993,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -2014,6 +2038,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -2057,6 +2083,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -2115,6 +2143,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300
@@ -2173,6 +2203,8 @@ alpha
 ..
 amd64
 ..
+aviion
+..
 cats
 ..
 hp300