Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

armish handled some early-gen arm machines, which required tons of 

workarounds.  Some of them will soon stand in the way of armv7.
Off to the attic you go.
OPENBSD_6_1
deraadt 8 years ago
parent
b21b9aedfb
commit
4589832ab3
11 changed files with 3 additions and 784 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      src/etc/Makefile
  2. +0
    -500
      src/etc/etc.armish/MAKEDEV
  3. +0
    -114
      src/etc/etc.armish/MAKEDEV.md
  4. +0
    -5
      src/etc/etc.armish/Makefile
  5. +0
    -6
      src/etc/etc.armish/Makefile.inc
  6. +0
    -26
      src/etc/etc.armish/disktab
  7. +0
    -1
      src/etc/etc.armish/fbtab
  8. +0
    -107
      src/etc/etc.armish/login.conf
  9. +0
    -0
      src/etc/etc.armish/sysctl.conf
  10. +0
    -14
      src/etc/etc.armish/ttys
  11. +1
    -9
      src/etc/mtree/4.4BSD.dist

+ 2
- 2
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.426 2016/08/09 21:24:31 halex Exp $
# $OpenBSD: Makefile,v 1.427 2016/08/10 14:27:15 deraadt Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -261,7 +261,7 @@ distrib:
release allarchs kernels release-sets m4 install-mtree \ release allarchs kernels release-sets m4 install-mtree \
bootblocks ${ALL_KERNELS} bootblocks ${ALL_KERNELS}
SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7
SUBDIR+= etc.alpha etc.amd64 etc.armv7
SUBDIR+= etc.hppa etc.i386 etc.landisk etc.loongson etc.luna88k SUBDIR+= etc.hppa etc.i386 etc.landisk etc.loongson etc.luna88k
SUBDIR+= etc.macppc etc.octeon SUBDIR+= etc.macppc etc.octeon
SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.zaurus SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.zaurus


+ 0
- 500
src/etc/etc.armish/MAKEDEV View File

@ -1,500 +0,0 @@
#!/bin/sh -
#
# THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
# generated from:
#
# OpenBSD: etc.armish/MAKEDEV.md,v 1.37 2016/04/28 18:17:31 natano Exp
# OpenBSD: MAKEDEV.common,v 1.88 2016/05/21 15:17:49 deraadt Exp
# OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp
# OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp
#
#
# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
#
# 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
# ch* SCSI media changers
# rd* "rd" pseudo-disks
# sd* SCSI disks, including flopticals
# vnd* "file" pseudo-disk devices
# wd* "winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
# Tapes:
# st* SCSI tape drives
# Terminal ports:
# tty[0-7][0-9a-f] NS16x50 serial ports
# Pseudo terminals:
# ptm pty master device
# pty* Set of 62 master pseudo terminals
# tty* Set of 62 slave pseudo terminals
# Console ports:
# ttyC-J* wscons display devices
# wscons Minimal wscons devices
# wskbd* wscons keyboards
# wsmouse* wscons mice
# wsmux wscons keyboard/mouse mux devices
# USB devices:
# ttyU* USB serial ports
# uall All USB devices
# ugen* Generic USB devices
# uhid* Generic HID devices
# ulpt* Printer devices
# usb* Bus control devices used by usbd for attach/detach
# Special purpose devices:
# apm Power management device
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf Berkeley Packet Filter
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# pci* PCI bus devices
# pf* Packet Filter
# pppx* PPP Multiplexer
# radio* FM tuner devices
# *random In-kernel random data source
# rmidi* Raw MIDI devices
# tun* Network tunnel driver
# tap* Ethernet tunnel driver
# uk* Unknown SCSI devices
# tuner* Tuner devices
# video* Video V4L2 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[0]:=";mknod"}
mklist[${#mklist[*]}]=" -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
ramdisk)
R std bpf wd0 wd1 sd0 tty00 rd0 wsmouse
R st0 ttyC0 wskbd0 apm bio diskmap random
;;
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 7 0
M stdout c 7 1
M stderr c 7 2
M ksyms c 8 0 640 kmem
M klog c 6 0 600
;;
vscsi*)
M vscsi$U c 100 $U 600
;;
video*)
M video$U c 38 $U 600
MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
;;
tuner*)
M tuner$U c 75 $(($(($U*2))+16)) 644
;;
uk*)
M uk$U c 28 $U 640 operator
;;
tap*)
M tap$U c 104 $U 600
;;
tun*)
M tun$U c 33 $U 600
;;
rmidi*)
M rmidi$U c 57 $U 666
;;
*random)
n=0
for pre in " " s u a
do
M ${pre}random c 40 $n 644
n=$(($n+1))
done
;;
radio*)
M radio$U c 97 $U
MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
;;
pppx*)
M pppx$U c 103 $U 600
;;
pf*)
M pf c 46 0 600
;;
pci*)
M pci$U c 88 $U 600
MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
;;
hotplug)
M hotplug c 37 $U 400
;;
fuse)
M fuse$U c 77 $U 600
;;
fd)
RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
MKlist[${#MKlist[*]}]=";chmod 555 fd"
;;
diskmap)
M diskmap c 102 0 640 operator
;;
bpf)
M bpf c 22 0 600
M bpf0 c 22 0 600
;;
bktr*)
M bktr$U c 75 $U 644
;;
bio)
M bio c 52 0 600
;;
audio*)
M sound$U c 36 $U
M mixer$U c 36 $(($U+16))
M audio$U c 36 $(($U+128))
M audioctl$U c 36 $(($U+192))
MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
;;
apm*)
M apm c 34 0 644
M apmctl c 34 8 644
;;
usb*)
[ "$i" = "usb" ] && u= || u=$U
M usb$u c 64 $U 660
;;
ulpt*)
M ulpt$U c 66 $U 660
;;
uhid*)
M uhid$U c 65 $U 660
;;
ugen*)
n=$(($U*16))
for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
do
M ugen$U.$j c 70 $(($n+10#$j)) 660
done
;;
uall)
R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
R ugen6 ugen7 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3 usb0 usb1
R usb2 usb3 usb4 usb5 usb6 usb7
;;
ttyU[0-9a-zA-Z])
U=${i#ttyU*}
o=$(alph2d $U)
M ttyU$U c 68 $o 660 dialer uucp
M cuaU$U c 68 $(($o+128)) 660 dialer uucp
;;
wsmux|wsmouse|wskbd)
M wsmouse c 63 0 600
M wskbd c 63 1 600
;;
wsmouse[0-9]*)
M wsmouse$U c 62 $U 600
;;
wskbd[0-9]*)
M wskbd$U c 61 $U 600
;;
wscons)
R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
;;
tty[C-J]*)
U=${i##tty[C-J]}
case $i in
ttyC*) n=C m=0;;
ttyD*) n=D m=256;;
ttyE*) n=E m=512;;
ttyF*) n=F m=768;;
ttyG*) n=G m=1024;;
ttyH*) n=H m=1280;;
ttyI*) n=I m=1536;;
ttyJ*) n=J m=1792;;
esac
case $U in
[0-9a-f]) M tty$n$U c 60 $((16#$U+$m)) 600;;
cfg) M tty${n}cfg c 60 $((255+$m)) 600;;
*) echo bad unit $U for $i; exit 1;;
esac
;;
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 98 0 666
;;
tty[0-7][0-9a-f])
U=${i#tty*}
o=$(h2d $U)
M tty$U c 12 $o 660 dialer uucp
M cua$U c 12 $(($o+128)) 660 dialer uucp
;;
st*)
n=$(($U*16))
for pre in " " n e en
do
M ${pre}st$U b 25 $n 660 operator
M ${pre}rst$U c 25 $n 660 operator
n=$(($n+1))
done
;;
vnd*)
dodisk vnd $U 19 19 $U 0
;;
rd*)
dodisk2 rd $U 18 18 $U 0
;;
ch*)
M ch$U c 27 $U 660 operator
;;
cd*)
dodisk2 cd $U 26 26 $U 0
;;
local)
test -s $T.local && sh $T.local
;;
all)
R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
R diskmap vscsi0 ch0 audio0 audio1 audio2 bpf fuse pppx
R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
R radio0 video0 video1 uk0 random tty00 tty01 tty02 tty03
R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf wd0
R wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
wd*) dodisk wd $U 16 16 $U 0;;
sd*) dodisk sd $U 24 24 $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

+ 0
- 114
src/etc/etc.armish/MAKEDEV.md View File

@ -1,114 +0,0 @@
define(MACHINE,armish)dnl
vers(__file__,
{-$OpenBSD: MAKEDEV.md,v 1.37 2016/04/28 18:17:31 natano Exp $-},
etc.MACHINE)dnl
dnl
dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
dnl All rights reserved.
dnl
dnl Redistribution and use in source and binary forms, with or without
dnl modification, are permitted provided that the following conditions
dnl are met:
dnl 1. Redistributions of source code must retain the above copyright
dnl notice, this list of conditions and the following disclaimer.
dnl 2. The name of the author may not be used to endorse or promote products
dnl derived from this software without specific prior written permission.
dnl
dnl THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
dnl THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
dnl EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
dnl PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
dnl OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
dnl WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
dnl
dnl
__devitem(apm, apm, Power management device)dnl
_TITLE(make)
_DEV(all)
_DEV(ramdisk)
_DEV(std)
_DEV(local)
_TITLE(dis)
_DEV(cd, 26, 26)
_DEV(ch, 27)
_DEV(rd, 18, 18)
_DEV(sd, 24, 24)
_DEV(vnd, 19, 19)
_DEV(wd, 16, 16)
_TITLE(tap)
_DEV(st, 25, 25)
_TITLE(term)
dnl _DEV(com, 12)
dnl _DEV(fcom, 54)
_DEV(com, 12)
_TITLE(pty)
_DEV(ptm, 98)
_DEV(pty, 5)
_DEV(tty, 4)
_TITLE(cons)
_DEV(wsdisp, 60)
_DEV(wscons)
_DEV(wskbd, 61)
_DEV(wsmouse, 62)
_DEV(wsmux, 63)
_TITLE(usb)
_DEV(ttyU, 68)
_DEV(uall)
_DEV(ugen, 70)
_DEV(uhid, 65)
_DEV(ulpt, 66)
_DEV(usb, 64)
_TITLE(spec)
_DEV(apm, 34)
_DEV(au, 36)
_DEV(bio, 52)
_DEV(bktr, 75)
_DEV(bpf, 22)
_DEV(diskmap, 102)
_DEV(fdesc, 7)
_DEV(fuse, 77)
_DEV(hotplug, 37)
_DEV(pci, 88)
_DEV(pf, 46)
_DEV(pppx, 103)
_DEV(radio, 97)
_DEV(rnd, 40)
_DEV(rmidi, 57)
_DEV(tun, 33)
_DEV(tap, 104)
_DEV(uk, 28)
_DEV(tuner, 75)
_DEV(vi, 38)
_DEV(vscsi, 100)
dnl
divert(__mddivert)dnl
dnl
ramdisk)
_recurse std bpf wd0 wd1 sd0 tty00 rd0 wsmouse
_recurse st0 ttyC0 wskbd0 apm bio diskmap random
;;
_std(1, 2, 8, 6)
;;
dnl
dnl *** armish specific targets
dnl
twrget(all, au, audio, 0, 1, 2)dnl
target(all, ch, 0)dnl
target(all, vscsi, 0)dnl
target(all, diskmap)dnl
twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
target(all, pty, 0)dnl
target(all, bio)dnl
target(all, tun, 0, 1, 2, 3)dnl
target(all, tap, 0, 1, 2, 3)dnl
target(all, xy, 0, 1, 2, 3)dnl
target(all, rd, 0)dnl
target(all, cd, 0, 1)dnl
target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
target(all, vnd, 0, 1, 2, 3)dnl

+ 0
- 5
src/etc/etc.armish/Makefile View File

@ -1,5 +0,0 @@
# $OpenBSD: Makefile,v 1.2 2008/06/15 01:51:55 todd Exp $
all: MAKEDEV
.include <bsd.prog.mk>

+ 0
- 6
src/etc/etc.armish/Makefile.inc View File

@ -1,6 +0,0 @@
# $OpenBSD: Makefile.inc,v 1.9 2011/07/22 09:30:54 espie Exp $
bootblocks:
cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
MDEXT= bsd.rd boot

+ 0
- 26
src/etc/etc.armish/disktab View File

@ -1,26 +0,0 @@
# $OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $
# Leave nc=16; adjust size using: ns
rdroot|ramdiskroot|RAM-disk root FS image:\
:dt=rdroot:se#512:nc#16:nt#2:ns#256:\
:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
:ob#0:pb#0:oc#0:pc#8192:
rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\
:dt=rdroot:se#512:nc#16:nt#2:ns#160:\
:oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\
:ob#0:pb#0:tb=swap:\
:oc#0:pc#5120:
# pseudo-geometry taken from rd794
miniroot:\
:dt=rdroot:ns#16:nt#7:nc#968:\
:pa#10240:ba#8192:fa#1024:
floppy|floppy3|3in|3.5in High Density Floppy:\
:dt=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:\
:pb#2880:ob#0:\
:pc#2880:oc#0:

+ 0
- 1
src/etc/etc.armish/fbtab View File

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

+ 0
- 107
src/etc/etc.armish/login.conf View File

@ -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:

+ 0
- 0
src/etc/etc.armish/sysctl.conf View File


+ 0
- 14
src/etc/etc.armish/ttys View File

@ -1,14 +0,0 @@
#
# $OpenBSD: ttys,v 1.4 2008/01/09 17:39:42 miod Exp $
#
# name getty type status comments
#
console "/usr/libexec/getty std.115200" vt220 on secure
tty00 "/usr/libexec/getty std.115200" unknown off secure
tty01 "/usr/libexec/getty std.9600" unknown off secure
tty02 "/usr/libexec/getty std.9600" unknown off
tty03 "/usr/libexec/getty std.9600" unknown off
tty04 "/usr/libexec/getty std.9600" unknown off
tty05 "/usr/libexec/getty std.9600" unknown off
tty06 "/usr/libexec/getty std.9600" unknown off
tty07 "/usr/libexec/getty std.9600" unknown off

+ 1
- 9
src/etc/mtree/4.4BSD.dist View File

@ -1,4 +1,4 @@
# $OpenBSD: 4.4BSD.dist,v 1.282 2016/05/11 21:52:48 deraadt Exp $
# $OpenBSD: 4.4BSD.dist,v 1.283 2016/08/10 14:27:16 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755 /set type=dir uname=root gname=wheel mode=0755
@ -466,8 +466,6 @@ usr
.. ..
amd64 amd64
.. ..
armish
..
i386 i386
.. ..
zaurus zaurus
@ -492,8 +490,6 @@ usr
.. ..
amd64 amd64
.. ..
armish
..
armv7 armv7
.. ..
hppa hppa
@ -526,8 +522,6 @@ usr
man5 man5
amd64 amd64
.. ..
armish
..
hppa hppa
.. ..
i386 i386
@ -554,8 +548,6 @@ usr
.. ..
amd64 amd64
.. ..
armish
..
armv7 armv7
.. ..
hppa hppa


Write Preview
Loading…
Cancel
Save