split sysctl.conf into MD and MI parts

21 files changed, 31 insertions, 5 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 34ba8f8c1a5..a1d79676ce9 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.85 1998/04/07 23:24:06 ryker Exp $
+#	$OpenBSD: Makefile,v 1.86 1998/05/05 21:51:51 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -18,7 +18,7 @@ BIN1=	aliases bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
 	locate.rc man.conf monthly motd mrouted.conf myname ipnat.rules \
 	netstart networks newsyslog.conf passwd.conf phones printcap \
 	protocols rbootd.conf rc rc.conf rc.local rc.securelevel remote rpc \
-	security services shells sysctl.conf syslog.conf weekly \
+	security services shells syslog.conf weekly \
 	etc.${MACHINE}/disktab
 
 # -rw-rw-r--
@@ -55,6 +55,10 @@ distribution-etc-root-var: distrib-dirs
 	    chown ${BINOWN} ${DESTDIR}/etc/ttys && \
 	    chgrp ${BINGRP} ${DESTDIR}/etc/ttys && \
 	    chmod 644 ${DESTDIR}/etc/ttys
+	cat sysctl.conf etc.${MACHINE}/sysctl.conf > ${DESTDIR}/etc/sysctl.conf && \
+	    chown ${BINOWN} ${DESTDIR}/etc/sysctl.conf && \
+	    chgrp ${BINGRP} ${DESTDIR}/etc/sysctl.conf && \
+	    chmod 644 ${DESTDIR}/etc/ttys
 	cat fbtab.head etc.${MACHINE}/fbtab fbtab.tail > ${DESTDIR}/etc/fbtab && \
 	    chown ${BINOWN} ${DESTDIR}/etc/fbtab && \
 	    chgrp ${BINGRP} ${DESTDIR}/etc/fbtab && \
diff --git a/etc/etc.alpha/sysctl.conf b/etc/etc.alpha/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.alpha/sysctl.conf
diff --git a/etc/etc.amiga/sysctl.conf b/etc/etc.amiga/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.amiga/sysctl.conf
diff --git a/etc/etc.arc/sysctl.conf b/etc/etc.arc/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.arc/sysctl.conf
diff --git a/etc/etc.arm32/sysctl.conf b/etc/etc.arm32/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.arm32/sysctl.conf
diff --git a/etc/etc.atari/sysctl.conf b/etc/etc.atari/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.atari/sysctl.conf
diff --git a/etc/etc.hp300/sysctl.conf b/etc/etc.hp300/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.hp300/sysctl.conf
diff --git a/etc/etc.i386/sysctl.conf b/etc/etc.i386/sysctl.conf
new file mode 100644
index 00000000000..2391845298f
--- /dev/null
+++ b/etc/etc.i386/sysctl.conf
@@ -0,0 +1 @@
+#machdep.allowaperture=1	# 1=On i386, permit access to aperture driver for XFree86
diff --git a/etc/etc.mac68k/sysctl.conf b/etc/etc.mac68k/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.mac68k/sysctl.conf
diff --git a/etc/etc.mvme68k/sysctl.conf b/etc/etc.mvme68k/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.mvme68k/sysctl.conf
diff --git a/etc/etc.mvme88k/sysctl.conf b/etc/etc.mvme88k/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.mvme88k/sysctl.conf
diff --git a/etc/etc.pc532/sysctl.conf b/etc/etc.pc532/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.pc532/sysctl.conf
diff --git a/etc/etc.pmax/sysctl.conf b/etc/etc.pmax/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.pmax/sysctl.conf
diff --git a/etc/etc.powerpc/sysctl.conf b/etc/etc.powerpc/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.powerpc/sysctl.conf
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index db55a0fb2f1..7cab2067f29 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.41 1998/04/30 06:12:51 jason Exp $
+#	$OpenBSD: MAKEDEV,v 1.42 1998/05/05 21:52:06 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -72,6 +72,7 @@
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
 #	*random	random data source
+#	magma*	magma card (makes 16 mtty and 2 mbpp)
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:/usr/etc
 this=$0
@@ -537,6 +538,27 @@ pty*)
 	esac
 	;;
 
+magma*)
+	case $unit in
+	0)	offset=0  nam=m;;
+	1)	offset=16 nam=n;;
+	2)	offset=32 nam=o;;
+	3)	offset=48 nam=p;;
+	*)	echo "bad unit for $i: $unit"; exit 127;;
+	esac
+	echo rm -f bppm${unit}? tty${nam}?
+	offset=`expr $unit \* 64`
+	n=0
+	while [ $n -lt 16 ]
+	do
+		name=$unit`hex $n`
+		echo mknod tty$name c 100 `add $offset $n`
+		n=`add $n 1`
+	done
+	echo mknod bppm${unit} c 101 `add $offset 0`
+	echo mknod bppm${unit} c 101 `add $offset 1`
+	;;
+
 random|srandom|urandom|prandom|arandom)
 	rm -f random urandom srandom prandom arandom
 	mknod  random c 119 0
diff --git a/etc/etc.sparc/sysctl.conf b/etc/etc.sparc/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.sparc/sysctl.conf
diff --git a/etc/etc.sun3/sysctl.conf b/etc/etc.sun3/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.sun3/sysctl.conf
diff --git a/etc/etc.vax/sysctl.conf b/etc/etc.vax/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.vax/sysctl.conf
diff --git a/etc/etc.wgrisc/sysctl.conf b/etc/etc.wgrisc/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.wgrisc/sysctl.conf
diff --git a/etc/etc.x68k/sysctl.conf b/etc/etc.x68k/sysctl.conf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/etc/etc.x68k/sysctl.conf
diff --git a/etc/sysctl.conf b/etc/sysctl.conf
index 31261e235b3..d6f953930d7 100644
--- a/etc/sysctl.conf
+++ b/etc/sysctl.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: sysctl.conf,v 1.8 1998/04/04 18:36:35 deraadt Exp $
+#	$OpenBSD: sysctl.conf,v 1.9 1998/05/05 21:51:53 deraadt Exp $
 # This files contains a list of sysctl options the user wants set at
 # boot time.
 # ie.
@@ -7,4 +7,3 @@
 #ddb.panic=0			# 0=Do not drop into ddb on a kernel panic
 #ddb.console=1			# 1=Permit entry of ddb from the console
 #fs.posix.setuid=0		# 0=Traditional BSD chown() semantics
-#machdep.allowaperture=1	# 1=On i386, permit access to aperture driver for XFree86