Permalink
Browse files

Merge branch 'master' of github.com:openbsd/flashboot

  • Loading branch information...
2 parents 24ccf8d + 101e0de commit df1ba58c00edd5aab6cc58830e2e7935d85cdd36 @jschlyter jschlyter committed Jul 20, 2013
Showing with 12 additions and 7 deletions.
  1. +1 −1 initial-conf/ttys
  2. +11 −6 list
View
@@ -16,7 +16,7 @@ ttyC8 "/usr/libexec/getty std.9600" vt220 off secure
ttyC9 "/usr/libexec/getty std.9600" vt220 off secure
ttyCa "/usr/libexec/getty std.9600" vt220 off secure
ttyCb "/usr/libexec/getty std.9600" vt220 off secure
-tty00 "/usr/libexec/getty std.9600" unknown off
+tty00 "/usr/libexec/getty std.19200" unknown on secure
tty01 "/usr/libexec/getty std.9600" unknown off
tty02 "/usr/libexec/getty std.9600" unknown off
tty03 "/usr/libexec/getty std.9600" unknown off
View
@@ -1,12 +1,13 @@
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL chmod 700 dev/MAKEDEV
-SPECIAL cd dev; ./MAKEDEV ramdisk pty systrace tty00 tty01 pci wdt0
+SPECIAL cd dev; ./MAKEDEV ramdisk ptm pty systrace tty00 tty01 pci wdt0
SPECIAL cd dev; ./MAKEDEV ttyU0 ttyU1
SPECIAL cd dev; ./MAKEDEV tun0 tun1 tun2 tun3 tun4 tun5 tun6 tun7
SPECIAL cd dev; ./MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
SPECIAL cd dev; ./MAKEDEV pf crypto fd wsmux wscons apm local gpio
SPECIAL cd dev; ./MAKEDEV sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
+SPECIAL cd dev; ./MAKEDEV pppx0
SPECIAL cd dev; ./MAKEDEV arandom
COPY ${DESTDIR}/etc/disktab etc/disktab
@@ -20,12 +21,14 @@ 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}/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
SPECIAL chmod 755 etc/netstart
SPECIAL touch var/cron/cron.deny
SPECIAL chown root.crontab var/cron/cron.deny
@@ -100,6 +103,8 @@ 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/npppd usr/sbin/npppd
+COPY ${DESTDIR}/usr/sbin/npppctl usr/sbin/npppctl
COPY ${DESTDIR}/usr/bin/ldd usr/bin/ldd
COPY ${DESTDIR}/sbin/mount_msdos sbin/mount_msdos
COPY ${DESTDIR}/sbin/kbd sbin/kbd

0 comments on commit df1ba58

Please sign in to comment.