Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #24 from arnobroekhof/master

Looks OK, will merge this.

Fixed issue #13 and file list synced with OpenBSD 5.3
  • Loading branch information...
commit 8862a5d34cf05c6e4ea6360b58fd18425338bd80 2 parents df1ba58 + 9621f55
@jryberg jryberg authored
View
3  .gitignore
@@ -0,0 +1,3 @@
+diststuff
+obj
+sandbox
View
54 SOEKRIS4501
@@ -57,11 +57,12 @@ pseudo-device carp # CARP protocol support
pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
pseudo-device gre # GRE encapsulation interface
pseudo-device loop # network loopback
-#pseudo-device ppp # PPP
+pseudo-device ppp # PPP
#pseudo-device sl # CSLIP
pseudo-device tun # network tunneling over tty
pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device trunk # Trunking support
+pseudo-device vether # Virtual Ethernet interface
# for IPv6
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
@@ -80,7 +81,7 @@ option DUMMY_NOPS # speed hack; recommended
maxusers 32 # estimated number of users
-option RAMDISK_HOOKS
+option RAMDISK_HOOKS
#option MINIROOTSIZE=16384 # disktab.8mb
#option MINIROOTSIZE=19456 # disktab.9.5mb
#option MINIROOTSIZE=20480 # disktab.10mb
@@ -89,14 +90,11 @@ option MINIROOTSIZE=98304 # disktab.48mb
#option MINIROOTSIZE=131072 # disktab.64mb
option NKPTP=16 # Needed when kernel+ramdisk > 16Mb
-config bsd root on rd0a swap on rd0b and wd0b and wd1b
-pseudo-device rd 1
-
-# Whacky timer
-option TIMER_FREQ=1189161
+config bsd root on rd0a swap on rd0b and wd0b and wd1b
+pseudo-device rd 1
# No swap, so crank this down
-option BUFCACHEPERCENT=1
+option BUFCACHEPERCENT=5
mainbus0 at root
@@ -110,22 +108,33 @@ pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
#ipmi0 at mainbus? disable # IPMI
isa0 at mainbus0
-isa0 at pcib?
pci* at mainbus0
option PCIVERBOSE
option EISAVERBOSE
-
-pchb* at pci? # PCI-Host bridges
-pci* at pchb?
-pcib* at pci? # PCI-ISA bridge
-ppb* at pci? # PCI-PCI bridges
-pci* at ppb? bus ?
+option USBVERBOSE
# power management and other environmental stuff
elansc* at pci? # AMD Elan SC520 System Controller
gpio* at elansc?
+# CardBus bus support
+cardbus* at cardslot?
+pcmcia* at cardslot?
+cbb* at pci?
+cardslot* at cbb?
+
+# USB Controllers
+ohci* at cardbus? # Open Host Controller
+
+# USB bus support
+usb* at ohci?
+
+# USB devices
+uhub* at usb? # USB Hubs
+umsm* at uhub? # Qualcomm MSM EVDO
+ucom* at umsm?
+
npx0 at isa? port 0xf0 irq 13 # math coprocessor
option WSDISPLAY_COMPAT_USL # VT handling
@@ -135,29 +144,22 @@ option WSDISPLAY_COMPAT_PCVT # emulate some ioctls
pckbc0 at isa? flags 0x00 # PC keyboard controller
pckbd* at pckbc? # PC keyboard
-#pms* at pckbc? # PS/2 mouse for wsmouse
vga* at pci?
wsdisplay* at vga? console ?
wskbd* at pckbd? mux 1
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
+com2 at isa? port 0x3e8 irq 5
+com* at pcmcia? # PCMCIA modems/serial ports
+#com* at cardbus?
wdc0 at isa? port 0x1f0 irq 14 flags 0x00
wd* at wdc? channel ? drive ? flags 0x0000
sis* at pci? # SiS 900/7016 ethernet
-nsphyter* at mii? # NS and compatible PHYs
-# Wireless network cards
-ath* at pci? # Atheros AR5k (802.11a/b/g)
-wi* at pci? # WaveLAN IEEE 802.11DS
-ral* at pci? # Ralink RT2500
-ipw* at pci? # Intel PRO/Wireless 2100
-iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
-
-# crypto support
-hifn* at pci? # Hi/fn 7751 crypto card
+nsphyter* at mii? # NS and compatible PHYs
pseudo-device bio 1 # ioctl multiplexing device
pseudo-device wsmux 2
View
2  SOEKRIS4521
@@ -93,7 +93,7 @@ config bsd root on rd0a swap on rd0b and wd0b and wd1b
pseudo-device rd 1
# No swap, so crank this down
-option BUFCACHEPERCENT=1
+option BUFCACHEPERCENT=5
mainbus0 at root
View
16 SOEKRIS5501
@@ -36,6 +36,7 @@ option INET # IP + ICMP + TCP + UDP
option ALTQ # ALTQ base
option INET6 # IPv6 (needs INET)
option IPSEC # IPsec
+option PIPEX # Pppac IP EXtension, for npppd
option PPP_BSDCOMP # PPP BSD compression
option PPP_DEFLATE
option MROUTING # Multicast router
@@ -46,6 +47,7 @@ pseudo-device pflog # pf log if
pseudo-device pfsync # pf sync if
pseudo-device pflow # pflow export if
pseudo-device enc 1 # option IPSEC needs the encapsulation interface
+pseudo-device vether # virtual Ethernet interface
pseudo-device pty 16 # pseudo-terminals
pseudo-device systrace 1 # system call tracing device
@@ -60,6 +62,7 @@ pseudo-device loop # network loopback
#pseudo-device ppp # PPP
#pseudo-device sl # CSLIP
pseudo-device tun # network tunneling over tty
+pseudo-device pppx # npppd
pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device trunk # Trunking support
@@ -170,14 +173,17 @@ wd* at wdc? channel ? drive ? flags 0x0000
wd* at pciide? channel ? drive ? flags 0x0000
vr* at pci? # VIA Rhine ethernet
+em* at pci? # Intel Pro/1000 ethernet
+bge* at pci? # Broadcom BCM57xx (aka Tigon3)
+bnx* at pci? # Broadcom BCM5706/5708 GigE
ukphy* at mii? # "unknown" PHYs
# Wireless network cards
-ath* at pci? # Atheros AR5k (802.11a/b/g)
-wi* at pci? # WaveLAN IEEE 802.11DS
-ral* at pci? # Ralink RT2500
-ipw* at pci? # Intel PRO/Wireless 2100
-iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
+# ath* at pci? # Atheros AR5k (802.11a/b/g)
+# wi* at pci? # WaveLAN IEEE 802.11DS
+# ral* at pci? # Ralink RT2500
+# ipw* at pci? # Intel PRO/Wireless 2100
+# iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
san* at pci? # Sangoma PCI AFT card
View
24 build-diskimage.sh
@@ -40,6 +40,30 @@ cylinders=980 # "cylinders:"
#trackscylinder=16 # "tracks/cylinder:"
#cylinders=994 # "cylinders:"
+# 1GB cards
+#totalsize=2001888 # "total sectors:"
+#bytessec=512 # "bytes/sector:"
+#sectorstrack=63 # "sectors/track:"
+#sectorscylinder=1008 # "sectors/cylinder:"
+#trackscylinder=16 # "tracks/cylinder:"
+#cylinders=994 # "cylinders:"
+
+# 2GB cards
+#totalsize=4001760 # "total sectors:"
+#bytessec=512 # "bytes/sector:"
+#sectorstrack=63 # "sectors/track:"
+#sectorscylinder=1008 # "sectors/cylinder:"
+#trackscylinder=16 # "tracks/cylinder:"
+#cylinders=994 # "cylinders:"
+
+# 4GB cards
+#totalsize=8003520 # "total sectors:"
+#bytessec=512 # "bytes/sector:"
+#sectorstrack=63 # "sectors/track:"
+#sectorscylinder=1008 # "sectors/cylinder:"
+#trackscylinder=16 # "tracks/cylinder:"
+#cylinders=994 # "cylinders:"
+
# Don't start without a imagefile as a parameter
if [ "$1" = "" ]; then
View
2  build-kernel.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Builds a 48MB kernel
+# Builds a 64MB kernel
CWD=`pwd`
WORKDIR=sandbox
View
1  initial-conf/hostname.em0
@@ -0,0 +1 @@
+inet 192.168.0.1 255.255.255.0 192.168.0.255
View
1  initial-conf/hostname.vr0
@@ -0,0 +1 @@
+inet 192.168.0.1 255.255.255.0 192.168.0.255
View
6 initial-conf/sysctl.conf
@@ -45,4 +45,10 @@ kern.splassert=2 # 2=Enable with verbose error messages
# required by some ports
#kern.emul.aout=1 # enable running dynamic OpenBSD a.out bins
#kern.emul.linux=1 # enable running Linux binaries
+#net.inet.gre.allow=1 # Allow GRE packets in and out of the system
+#net.inet.gre.wccp=1 # Allow WCCPv1-style GRE packets into the system
+#net.inet.mobileip.allow=1 # Allow MobileIP packets in and out of the system
+#net.pipex.enable=1 # 1=Enable pipex(4) for npppd(8)
+#net.inet.tcp.always_keepalive=1 # 1=Keepalives for all connections (e.g. hotel/airport NAT)
+#net.inet.tcp.keepidle=100 # 100=send TCP keepalives every 50 seconds
View
26 list
@@ -21,14 +21,15 @@ COPY ${DESTDIR}/etc/shells etc/shells
COPY ${DESTDIR}/etc/ksh.kshrc etc/ksh.kshrc
COPY ${DESTDIR}/etc/pf.os etc/pf.os
COPY ${DESTDIR}/usr/share/zoneinfo/GMT etc/localtime
-COPY ${DESTDIR}/var/named/etc/named.conf var/named/etc/named.conf
-COPY ${DESTDIR}/var/named/standard/localhost var/named/standard/localhost
-COPY ${DESTDIR}/var/named/standard/loopback var/named/standard/loopback
-COPY ${DESTDIR}/var/named/standard/loopback6.arpa var/named/standard/loopback6.arpa
-COPY ${DESTDIR}/var/named/etc/root.hint var/named/etc/root.hint
-COPY ${DESTDIR}/etc/mtree/4.4BSD.dist etc/mtree/4.4BSD.dist
-COPY ${DESTDIR}/etc/npppd/npppd-users etc/npppd/npppd-users
-COPY ${DESTDIR}/etc/npppd/npppd.conf etc/npppd/npppd.conf
+COPY ${DESTDIR}/var/named/etc/named.conf var/named/etc/named.conf
+COPY ${DESTDIR}/var/named/standard/localhost var/named/standard/localhost
+COPY ${DESTDIR}/var/named/standard/loopback var/named/standard/loopback
+COPY ${DESTDIR}/var/named/standard/loopback6.arpa var/named/standard/loopback6.arpa
+COPY ${DESTDIR}/var/named/etc/root.hint var/named/etc/root.hint
+COPY ${DESTDIR}/etc/mtree/4.4BSD.dist etc/mtree/4.4BSD.dist
+COPY ${DESTDIR}/etc/npppd/npppd-users etc/npppd/npppd-users
+COPY ${DESTDIR}/etc/npppd/npppd.conf etc/npppd/npppd.conf
+COPY ${DESTDIR}/etc/snmpd.conf etc/snmpd.conf
SPECIAL chmod 755 etc/netstart
SPECIAL touch var/cron/cron.deny
SPECIAL chown root.crontab var/cron/cron.deny
@@ -103,6 +104,15 @@ COPY ${DESTDIR}/usr/sbin/named usr/sbin/named
COPY ${DESTDIR}/usr/sbin/rndc usr/sbin/rndc
COPY ${DESTDIR}/usr/sbin/rndc-confgen usr/sbin/rndc-confgen
COPY ${DESTDIR}/usr/sbin/dig usr/sbin/dig
+COPY ${DESTDIR}/usr/sbin/useradd /usr/sbin/useradd
+COPY ${DESTDIR}/usr/sbin/userdel /usr/sbin/userdel
+COPY ${DESTDIR}/usr/sbin/userinfo /usr/sbin/userinfo
+COPY ${DESTDIR}/usr/sbin/usermod /usr/sbin/usermod
+COPY ${DESTDIR}/usr/sbin/adduser /usr/sbin/adduser
+COPY ${DESTDIR}/usr/sbin/groupadd /usr/sbin/groupadd
+COPY ${DESTDIR}/usr/sbin/groupinfo /usr/sbin/groupinfo
+COPY ${DESTDIR}/usr/sbin/groupdel /usr/sbin/groupdel
+COPY ${DESTDIR}/usr/sbin/groupmod /usr/sbin/groupmod
COPY ${DESTDIR}/usr/sbin/npppd usr/sbin/npppd
COPY ${DESTDIR}/usr/sbin/npppctl usr/sbin/npppctl
COPY ${DESTDIR}/usr/bin/ldd usr/bin/ldd

1 comment on commit 8862a5d

@jryberg
Owner

Verified with Soekris 4801 128Mb ram and 4 Gb flash and the live-cd ISO

Please sign in to comment.
Something went wrong with that request. Please try again.