From NetBSD: merge of 960317

diff --git a/etc/crontab b/etc/crontab
index dc4e4cf..085bd54 100644 (file)
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,5 +1,7 @@
+#      $OpenBSD: crontab,v 1.2 1996/03/28 18:24:33 niklas Exp $
+#      $NetBSD: crontab,v 1.10 1996/02/18 12:08:26 mycroft Exp $
+#
 # /var/cron/tabs/root - root's crontab for NetBSD
-# $Id: crontab,v 1.1.1.1 1995/10/18 08:37:56 deraadt Exp $
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
@@ -7,7 +9,7 @@ HOME=/var/log
 #
 #minute        hour    mday    month   wday    command
 #
-0-59/10        *       *       *       *       /usr/libexec/atrun
+*/10   *       *       *       *       /usr/libexec/atrun
 #
 # rotate log files every hour, if necessary
 0      *       *       *       *       /usr/bin/newsyslog

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index a6f5929..2b8edc1 100644 (file)
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,6 @@
 #!/bin/sh -
-#      $NetBSD: MAKEDEV,v 1.7 1996/01/05 17:12:39 cgd Exp $
+#      $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 $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -55,6 +56,10 @@
 # Pseudo terminals:
 #      pty*    set of 16 master and slave pseudo terminals
 #
+# Printers:
+#      lpt*    stock lp
+#      lpa*    interruptless lp
+#
 # Special purpose devices:
 #      ch*     SCSI media changer
 #      bpf*    packet filter
@@ -77,7 +82,8 @@ all)
        sh MAKEDEV ccd0 ccd1 ccd2 ccd3
        sh MAKEDEV bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2 tun3
        sh MAKEDEV ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 lkm
-       sh MAKEDEV mmclock kbd mouse local
+       sh MAKEDEV mmclock kbd mouse lpa0 lpt0
+       sh MAKEDEV local
        ;;
 
 std)
@@ -269,6 +275,17 @@ mouse)
        chmod 666 mouse
        ;;
 
+lpt*|lpa*)
+       unit=`expr $i : '...\(.*\)'`
+       case $i in
+       lpt*) name=lpt; flags=0;;
+       lpa*) name=lpa; flags=128;;
+       esac
+       rm -f $name$unit
+       mknod $name$unit c 31 `expr $unit + $flags`
+       chown root.wheel $name$unit
+       ;;
+
 local)
        umask 0
        sh MAKEDEV.local

diff --git a/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV
index 915998e..f900720 100644 (file)
--- a/etc/etc.amiga/MAKEDEV
+++ b/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,7 @@
 #!/bin/sh -
 #
-#      $NetBSD: MAKEDEV,v 1.18 1995/11/28 05:40:18 jtc Exp $
+#      $OpenBSD: MAKEDEV,v 1.5 1996/03/28 18:24:37 niklas Exp $
+#      $NetBSD: MAKEDEV,v 1.19 1996/03/02 13:58:04 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -88,8 +89,8 @@ for i
 do
 case $i in
 all)
-       sh MAKEDEV std fd st0 ttye0 ttye1 ttye2 ttye3 ttye4 mouse0 mouse1
-       sh MAKEDEV tty00 ttyA0 ttyA1 grf0 grf1 grf2 grf3 grf4 grf5
+       sh MAKEDEV std fd st0 ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 mouse0
+       sh MAKEDEV mouse1 tty00 ttyA0 ttyA1 grf0 grf1 grf2 grf3 grf4 grf5
        sh MAKEDEV kbd sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 vnd0 vnd1 vnd2
        sh MAKEDEV vnd3 vnd4 view00 view01 view02 view03 view04 view05 pty0 
        sh MAKEDEV vnd5 vnd6 cd0 fd0 fd1 fd2 fd3 bpf0 bpf1 bpf2 bpf3 ipl
@@ -99,7 +100,8 @@ all)
 
 floppy)
        sh MAKEDEV std kbd pty0 tty00 ttyA0 ttyA1 tun0 tun1
-       sh MAKEDEV grf0 grf1 grf2 grf3 grf4 grf5 ttye0 ttye1 ttye2 ttye3 ttye4
+       sh MAKEDEV grf0 grf1 grf2 grf3 grf4 grf5
+       sh MAKEDEV ttye0 ttye1 ttye2 ttye3 ttye4 ttye5
        sh MAKEDEV cd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 st0
        sh MAKEDEV fd0 fd1 fd2 fd3 
        ;;
@@ -315,7 +317,7 @@ ttye*)
        rm -f ttye${unit}
        rm -f ite*
        case $unit in
-       0|1|2|3|4)
+       0|1|2|3|4|5)
                mknod ttye${unit} c 13 ${unit}
                ;;
        *)

diff --git a/etc/etc.amiga/ttys b/etc/etc.amiga/ttys
index 292ed44..8a18007 100644 (file)
--- a/etc/etc.amiga/ttys
+++ b/etc/etc.amiga/ttys
@@ -1,5 +1,6 @@
 #
-#      $NetBSD: ttys,v 1.11 1995/10/09 02:25:46 chopps Exp $
+#      $OpenBSD: ttys,v 1.2 1996/03/28 18:24:38 niklas Exp $
+#      $NetBSD: ttys,v 1.12 1996/03/02 13:58:06 veego Exp $
 #
 #      from: @(#)ttys  5.1 (Berkeley) 4/17/89
 #
@@ -13,6 +14,7 @@ ttye1 "/usr/libexec/getty Pc"         vt220   on secure       # retina
 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
 tty00  "/usr/libexec/getty std.9600"   unknown off secure      # int. serial.
 ttyp0  none                    network
 ttyp1  none                    network

diff --git a/etc/etc.sun3/MAKEDEV b/etc/etc.sun3/MAKEDEV
index 6481858..15fe326 100644 (file)
--- a/etc/etc.sun3/MAKEDEV
+++ b/etc/etc.sun3/MAKEDEV
@@ -1,5 +1,8 @@
 #!/bin/sh -
 #
+#      $OpenBSD: MAKEDEV,v 1.6 1996/03/28 18:24:39 niklas Exp $
+#      $NetBSD: MAKEDEV,v 1.8 1996/03/03 16:54:17 thorpej Exp $
+#
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
 #
@@ -32,7 +35,6 @@
 # SUCH DAMAGE.
 #
 #      @(#)MAKEDEV     5.5 (Berkeley) 5/28/91
-#      $Id: MAKEDEV,v 1.5 1996/02/17 21:33:17 niklas Exp $
 #
 # Device "make" file.  Valid arguments:
 #      std     standard devices

diff --git a/etc/etc.vax/Makefile.inc b/etc/etc.vax/Makefile.inc
new file mode 100644 (file)
index 0000000..86ac72a
--- /dev/null
+++ b/etc/etc.vax/Makefile.inc
@@ -0,0 +1,13 @@
+#      $OpenBSD: Makefile.inc,v 1.1 1996/03/28 18:24:40 niklas Exp $
+#      $NetBSD: Makefile.inc,v 1.1 1996/03/14 17:32:16 ragge Exp $
+#
+#      etc.vax/Makefile.inc -- vax-specific etc Makefile targets
+#
+
+.ifdef DESTDIR
+distribution: pcs750.bin
+
+pcs750.bin:
+       (cd etc.vax;uudecode pcs750.bin.uu)
+
+.endif

diff --git a/etc/etc.vax/disktab b/etc/etc.vax/disktab
index 70dbfd4..594b687 100644 (file)
--- a/etc/etc.vax/disktab
+++ b/etc/etc.vax/disktab
@@ -1,4 +1,5 @@
-#      $NetBSD: disktab,v 1.1 1995/08/25 21:25:11 ragge Exp $
+#      $OpenBSD: disktab,v 1.2 1996/03/28 18:24:41 niklas Exp $
+#      $NetBSD: disktab,v 1.2 1996/03/05 12:01:53 ragge Exp $
 #
 #      @(#)disktab     8.1 (Berkeley) 6/9/93
 #
@@ -488,4 +489,18 @@ ncc2|nec2363|1Gb NEC:\
        :pf#1067904:of#701568:bf#8192:ff#1024:\
        :pg#1392768:og#376704:bg#8192:fg#1024:\
        :ph#291346:oh#84672:bh#8192:fh#1024:
+#
+# Special disktab entries used when creating distributions.
+#
+bootroot|fake-type used in install boot:\
+       :ty=fake:se#512:nt#1:rm#10:ns#512:nc#1:\
+       :pa#512:oa#0:ba#4096:fa#512:\
+       :pb#512:ob#0:bb#4096:fb#512:\
+       :pc#512:oc#0:bc#4096:fc#512:
+
+miniroot|fake-type used when installation:\
+       :ty=fake:se#512:nt#1:rm#3600:ns#2048:nc#1:\
+       :pa#4096:oa#0:ba#4096:fa#512:\
+       :pb#4096:ob#0:bb#4096:fb#512:\
+       :pc#4096:oc#0:bc#4096:fc#512:
 

diff --git a/etc/services b/etc/services
index edcee89..a3e05b3 100644 (file)
--- a/etc/services
+++ b/etc/services
@@ -1,3 +1,5 @@
+#      $OpenBSD: services,v 1.3 1996/03/28 18:24:34 niklas Exp $
+#      $NetBSD: services,v 1.17 1996/02/25 02:19:56 ghudson Exp $
 #
 # Network services, Internet style
 #
@@ -8,7 +10,6 @@
 # are included, only the more common ones.
 #
 #      from: @(#)services      5.8 (Berkeley) 5/9/91
-#      $Id: services,v 1.2 1995/12/17 18:39:05 tholo Exp $
 #
 tcpmux         1/tcp           # TCP port service multiplexer
 echo           7/tcp
@@ -171,8 +172,10 @@ kshell             544/tcp         krcmd   # Kerberos `rsh'
 kerberos-adm   749/tcp                 # Kerberos `kadmin' (v5)
 kerberos       750/udp         kdc     # Kerberos (server) udp
 kerberos       750/tcp         kdc     # Kerberos (server) tcp
-krbupdate      760/tcp         kreg    # Kerberos registration
-kpasswd                761/tcp         kpwd    # Kerberos `passwd'
+kerberos-master        751/udp                 # Kerberos admin server udp
+kerberos-master        751/tcp                 # Kerberos admin server tcp
+krbupdate      760/tcp         kreg    # BSD Kerberos registration
+kpasswd                761/tcp         kpwd    # BSD Kerberos `passwd'
 eklogin                2105/tcp                # Kerberos encrypted `rlogin'
 #
 # Unofficial but necessary (for NetBSD) services