diff --git a/src/etc/Makefile b/src/etc/Makefile index 6f160a9f..20e90b23 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.415 2015/11/30 23:35:29 jturner Exp $ +# $OpenBSD: Makefile,v 1.416 2015/12/01 07:50:03 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -40,10 +40,7 @@ MUTABLE=changelist csh.cshrc csh.login csh.logout daily \ EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \ httpd.conf ifstated.conf inetd.conf \ man.conf mixerctl.conf mrouted.conf \ - ntpd.conf printcap rbootd.conf remote sensorsd.conf -.if ${MACHINE} != "aviion" -EXAMPLES+= wsconsctl.conf -.endif + ntpd.conf printcap rbootd.conf remote sensorsd.conf wsconsctl.conf # -rw------- EXAMPLES_600=bgpd.conf dvmrpd.conf eigrpd.conf hostapd.conf iked.conf \ @@ -273,7 +270,7 @@ distrib: release allarchs kernels release-sets m4 install-mtree \ bootblocks ${ALL_KERNELS} -SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7 etc.aviion +SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7 SUBDIR+= etc.hppa etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k SUBDIR+= etc.macppc etc.octeon SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.vax etc.zaurus diff --git a/src/etc/etc.aviion/MAKEDEV b/src/etc/etc.aviion/MAKEDEV deleted file mode 100644 index a8d626f2..00000000 --- a/src/etc/etc.aviion/MAKEDEV +++ /dev/null @@ -1,372 +0,0 @@ -#!/bin/sh - -# -# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. -# generated from: -# -# OpenBSD: etc.aviion/MAKEDEV.md,v 1.21 2015/10/23 15:14:11 claudio Exp -# OpenBSD: MAKEDEV.common,v 1.81 2015/11/10 21:49:18 sthen Exp -# OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp -# OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp -# -# -# Copyright (c) 2001-2004 Todd T. Fries -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# -# Device "make" file. Valid arguments: -# all makes all known devices, including local devices. -# Tries to make the ``standard'' number of each type. -# ramdisk Ramdisk kernel devices -# std Standard devices -# local Configuration specific devices -# Disks: -# cd* ATAPI and SCSI CD-ROM drives -# rd* "rd" pseudo-disks -# sd* SCSI disks, including flopticals -# vnd* "file" pseudo-disk devices -# Tapes: -# ch* SCSI media changers -# st* SCSI tape drives -# Terminal ports: -# ttya-c on-board serial and mouse ports -# Pseudo terminals: -# ptm pty master device -# pty* Set of 62 master pseudo terminals -# tty* Set of 62 slave pseudo terminals -# Special purpose devices: -# bio ioctl tunnel pseudo-device -# bpf* Berkeley Packet Filter -# diskmap Disk mapper -# fd fd/* nodes -# fuse Userland Filesystem -# nvram0 On-board non-volatile memory -# pf* Packet Filter -# pppx* PPP Multiplexer -# *random In-kernel random data source -# systrace* System call tracing device -# tun* Network tunnel driver -# tap* Ethernet tunnel driver -# uk* Unknown SCSI devices -# vscsi* Virtual SCSI controller -PATH=/sbin:/usr/sbin:/bin:/usr/bin -T=$0 - -# set this to echo for Echo-Only debugging -[ "$eo" ] || eo= - -hex() -{ - case $1 in - [0-9]) echo -n $1;; - 10) echo -n a;; - 11) echo -n b;; - 12) echo -n c;; - 13) echo -n d;; - 14) echo -n e;; - 15) echo -n f;; - esac -} - -alph2d() -{ - local t="$1" - local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - local sub=${p%${t}*} - echo ${#sub} -} - -h2d() -{ - local s="$1" - local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*} - - echo $(($(_h2d $f)*16+ $(_h2d $n) )) -} - -_h2d() -{ - case $1 in - [0-9]) echo -n $1;; - a) echo -n 10;; - b) echo -n 11;; - c) echo -n 12;; - d) echo -n 13;; - e) echo -n 14;; - f) echo -n 15;; - esac -} - -unt() -{ - # XXX pdksh can't seem to deal with locally scoped variables - # in ${foo#$bar} expansions - arg="$1" - tmp="${arg#[a-zA-Z]*}" - tmp="${tmp%*[a-zA-Z]}" - while [ "$tmp" != "$arg" ] - do - arg=$tmp - tmp="${arg#[a-zA-Z]*}" - tmp="${tmp%*[a-zA-Z]}" - done - echo $arg -} - -dodisk() -{ - [ "$DEBUG" ] && set -x - n=$(($((${5}*${7:-16}))+${6})) count=0 - [ 0$7 -ne 8 ] && l="i j k l m n o p" - for d in a b c d e f g h $l - do - M $1$2$d b $3 $(($n+$count)) 640 operator - M r$1$2$d c $4 $(($n+$count)) 640 operator - let count=count+1 - done -} - -dodisk2() -{ - n=$(($(($5*${7:-16}))+$6)) - M $1$2a b $3 $n 640 operator - M r$1$2a c $4 $n 640 operator - n=$(($n+2)) - M $1$2c b $3 $n 640 operator - M r$1$2c c $4 $n 640 operator -} - -# M name b/c major minor [mode] [group] -RMlist[0]="rm -f" - -mkl() { - mklist[${#mklist[*]}]=";mknod -m $1 $2 $3 $4 $5" -} - -M() { - RMlist[${#RMlist[*]}]=$1 - mkl ${5-666} $1 $2 $3 $4 - G=${6:-wheel} - [ "$7" ] && { - MKlist[${#MKlist[*]}]="&& chown $7:$G $1" - } || { - case $G in - wheel) - [ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel" - whlist[${#whlist[*]}]="$1" - ;; - operator) - [ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator" - oplist[${#oplist[*]}]="$1" - ;; - *) - MKlist[${#MKlist[*]}]="&& chgrp $G $1"; - esac - } - return 0 -} - -R() { -[ "$DEBUG" ] && set -x -for i in "$@" -do -U=`unt $i` -[ "$U" ] || U=0 - -case $i in -std) - M console c 0 0 600 - M tty c 1 0 - M mem c 2 0 640 kmem - M kmem c 2 1 640 kmem - M null c 2 2 - M zero c 2 12 - M stdin c 21 0 - M stdout c 21 1 - M stderr c 21 2 - M ksyms c 43 0 640 kmem - M klog c 6 0 600 - ;; - - -vscsi*) - M vscsi$U c 53 $U 600 - ;; - -uk*) - M uk$U c 41 $U 640 operator - ;; - -tap*) - M tap$U c 56 $U 600 - ;; - -tun*) - M tun$U c 23 $U 600 - ;; - -systrace) - M systrace c 50 0 644 - ;; - -*random) - n=0 - for pre in " " s u a - do - M ${pre}random c 40 $n 644 - n=$(($n+1)) - done - ;; - -pppx*) - M pppx$U c 55 $U 600 - ;; - -pf*) - M pf c 39 0 600 - ;; - -nvram0) - M nvram0 c 10 0 640 kmem - ;; - -fuse) - M fuse$U c 45 $U 600 - ;; - -fd) - RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0 - while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done - MKlist[${#MKlist[*]}]=";chmod 555 fd" - ;; - -diskmap) - M diskmap c 54 0 640 operator - ;; - -bpf*) - M bpf$U c 22 $U 600 - ;; - -bio) - M bio c 49 0 600 - ;; - -pty*) - if [ $U -gt 15 ]; then - echo bad unit for pty in: $i - continue - fi - set -A letters p q r s t u v w x y z P Q R S T - set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \ - r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \ - Y Z - - name=${letters[$U]} - n=0 - while [ $n -lt 62 ] - do - nam=$name${suffixes[$n]} - off=$(($U*62)) - M tty$nam c 4 $(($off+$n)) - M pty$nam c 5 $(($off+$n)) - n=$(($n+1)) - done - ;; - -ptm) - M ptm c 52 0 666 - ;; - -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 12 $n 660 dialer uucp - M cua$u c 12 $(($n+128)) 660 dialer uucp - ;; - esac - ;; - -st*) - n=$(($U*16)) - for pre in " " n e en - do - M ${pre}st$U b 5 $n 660 operator - M ${pre}rst$U c 20 $n 660 operator - n=$(($n+1)) - done - ;; - -ch*) - M ch$U c 44 $U 660 operator - ;; - -vnd*) - dodisk vnd $U 8 19 $U 0 - ;; - -rd*) - dodisk2 rd $U 7 18 $U 0 - ;; - -cd*) - dodisk2 cd $U 6 9 $U 0 - ;; - -local) - test -s $T.local && sh $T.local - ;; - -ramdisk) - R diskmap bio pty0 ttya rd0 cd0 cd1 st0 st1 sd0 sd1 sd2 sd3 - R sd4 bpf0 std - ;; - -all) - R ttya ttyb ttyc vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 - R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0 - R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap - R vscsi0 ch0 nvram0 fuse pppx ptm local uk0 random pf systrace - R std st0 st1 fd - ;; - -sd*) - case $i in - sd*) dodisk sd $U 4 8 $U 0;; - esac - ;; - -*) - echo $i: unknown device - ;; -esac -done -} -R "$@" -{ -echo -n ${RMlist[*]} -echo -n ${mklist[*]} -echo -n ${MKlist[*]} -echo -n ${whlist[*]} -echo ${oplist[*]} -} | if [ "$eo" = "echo" ]; then - cat -else - sh -fi diff --git a/src/etc/etc.aviion/MAKEDEV.md b/src/etc/etc.aviion/MAKEDEV.md deleted file mode 100644 index d5fbdb40..00000000 --- a/src/etc/etc.aviion/MAKEDEV.md +++ /dev/null @@ -1,110 +0,0 @@ -define(MACHINE,aviion)dnl -vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.21 2015/10/23 15:14:11 claudio Exp $-}, -etc.MACHINE)dnl -dnl -dnl Copyright (c) 2001-2006 Todd T. Fries -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 *** aviion-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, vscsi, 0)dnl -target(all, diskmap)dnl -target(all, pty, 0)dnl -target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl -target(all, bio)dnl -target(all, tun, 0, 1, 2, 3)dnl -target(all, tap, 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 -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 -target(ramd, bio)dnl -target(ramd, diskmap)dnl -target(ramd, random)dnl -_DEV(ramd) -dnl -_DEV(std) -_DEV(local) -dnl -_TITLE(dis) -_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(bio, 49) -_DEV(bpf, 22) -_DEV(diskmap, 54) -_DEV(fdesc, 21) -_DEV(fuse, 45) -_DEV(nvram, 10) -_DEV(pf, 39) -_DEV(pppx, 55) -_DEV(rnd, 40) -_DEV(systrace, 50) -_DEV(tun, 23) -_DEV(tap, 56) -_DEV(uk, 41) -_DEV(vscsi, 53) -dnl -divert(__mddivert)dnl -dnl -_std(1, 2, 43, 6) - ;; - diff --git a/src/etc/etc.aviion/Makefile b/src/etc/etc.aviion/Makefile deleted file mode 100644 index 324bc976..00000000 --- a/src/etc/etc.aviion/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $ - -all: MAKEDEV - -.include diff --git a/src/etc/etc.aviion/Makefile.inc b/src/etc/etc.aviion/Makefile.inc deleted file mode 100644 index 2724bdee..00000000 --- a/src/etc/etc.aviion/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -# $OpenBSD: Makefile.inc,v 1.8 2013/10/15 13:28:08 miod Exp $ - -KERNELS += GENERIC.MP bsd.mp - -bootblocks: - cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/ - -MDEXT= bsd.rd bsd.rd.xcf \ - boot diff --git a/src/etc/etc.aviion/disktab b/src/etc/etc.aviion/disktab deleted file mode 100644 index 7092ea3e..00000000 --- a/src/etc/etc.aviion/disktab +++ /dev/null @@ -1,6 +0,0 @@ -# $OpenBSD: disktab,v 1.5 2015/08/18 15:37:48 krw Exp $ - -rdroot|ramdiskroot|RAM-disk root FS image:\ - :dt=rdroot: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: diff --git a/src/etc/etc.aviion/fbtab b/src/etc/etc.aviion/fbtab deleted file mode 100644 index ef2d6ba4..00000000 --- a/src/etc/etc.aviion/fbtab +++ /dev/null @@ -1 +0,0 @@ -/dev/ttya 0600 /dev/console diff --git a/src/etc/etc.aviion/login.conf b/src/etc/etc.aviion/login.conf deleted file mode 100644 index 07d1515b..00000000 --- a/src/etc/etc.aviion/login.conf +++ /dev/null @@ -1,107 +0,0 @@ -# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:49 sthen Exp $ - -# -# Sample login.conf file. See login.conf(5) for details. -# - -# -# Standard authentication styles: -# -# passwd Use only the local password file -# chpass Do not authenticate, but change users password (change -# the YP password if the user has one, else change the -# local password) -# lchpass Do not login; change user's local password instead -# radius Use radius authentication -# reject Use rejected authentication -# skey Use S/Key authentication -# activ ActivCard X9.9 token authentication -# crypto CRYPTOCard X9.9 token authentication -# snk Digital Pathways SecureNet Key authentication -# tis TIS Firewall Toolkit authentication -# token Generic X9.9 token authentication -# yubikey YubiKey authentication -# - -# Default allowed authentication styles -auth-defaults:auth=passwd,skey: - -# Default allowed authentication styles for authentication type ftp -auth-ftp-defaults:auth-ftp=passwd: - -# -# The default values -# To alter the default authentication types change the line: -# :tc=auth-defaults:\ -# to be read something like: (enables passwd, "myauth", and activ) -# :auth=passwd,myauth,activ:\ -# Any value changed in the daemon class should be reset in default -# class. -# -default:\ - :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\ - :umask=022:\ - :datasize-max=512M:\ - :datasize-cur=512M:\ - :maxproc-max=256:\ - :maxproc-cur=128:\ - :openfiles-cur=512:\ - :stacksize-cur=4M:\ - :localcipher=blowfish,8:\ - :tc=auth-defaults:\ - :tc=auth-ftp-defaults: - -# -# Settings used by /etc/rc and root -# This must be set properly for daemons started as root by inetd as well. -# Be sure reset these values back to system defaults in the default class! -# -daemon:\ - :ignorenologin:\ - :datasize=infinity:\ - :maxproc=infinity:\ - :openfiles-cur=128:\ - :stacksize-cur=8M:\ - :localcipher=blowfish,9:\ - :tc=default: - -# -# Staff have fewer restrictions and can login even when nologins are set. -# -staff:\ - :datasize-cur=512M:\ - :datasize-max=infinity:\ - :maxproc-max=512:\ - :maxproc-cur=128:\ - :ignorenologin:\ - :requirehome@:\ - :tc=default: - -# -# Authpf accounts get a special motd and shell -# -authpf:\ - :welcome=/etc/motd.authpf:\ - :shell=/usr/sbin/authpf:\ - :tc=default: - -# -# Building ports with DPB uses raised limits -# -pbuild:\ - :datasize-max=infinity:\ - :datasize-cur=1024M:\ - :maxproc-max=1024:\ - :maxproc-cur=256:\ - :tc=default: - -# -# Override resource limits for certain daemons started by rc.d(8) -# -bgpd:\ - :openfiles-cur=512:\ - :tc=daemon: - -unbound:\ - :openfiles-cur=512:\ - :tc=daemon: diff --git a/src/etc/etc.aviion/sysctl.conf b/src/etc/etc.aviion/sysctl.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/src/etc/etc.aviion/ttys b/src/etc/etc.aviion/ttys deleted file mode 100644 index d98de75e..00000000 --- a/src/etc/etc.aviion/ttys +++ /dev/null @@ -1,9 +0,0 @@ -# -# $OpenBSD: ttys,v 1.2 2008/01/09 17:39:42 miod Exp $ -# -# name getty type status comments -# -console "/usr/libexec/getty std.9600" vt220 on secure -# on-board serial ports (ttyb is the mouse port) -ttya "/usr/libexec/getty std.9600" unknown off secure # console -ttyc "/usr/libexec/getty std.9600" unknown off