Permalink
Browse files

Merge pull request #26 from KillerDiller/pull-20130914a

Add some more standard executables and daemons to the ramdisk.
  • Loading branch information...
2 parents ab50eea + 05acde6 commit 2910ff0459d44af17550a6b326434529c8a180ed @jryberg jryberg committed Oct 6, 2013
Showing with 41 additions and 5 deletions.
  1. +1 −1 Makefile
  2. +5 −0 initial-conf/rc.conf
  3. +25 −3 initial-conf/rc.initial
  4. +10 −1 list
View
@@ -33,7 +33,7 @@ NEWFSARGS= -m 0 -o space
KOPTS= #-Os
TERMTYPES= dumb unknown vt100 vt100-nav vt220 xterm xterm-new \
- xterm-xfree86 cygwin gnome vt102 ansi
+ xterm-xfree86 cygwin gnome vt102 ansi screen
.PATH: ${.CURDIR}
TOP= ${.CURDIR}
View
@@ -14,6 +14,7 @@ dhcpd_flags=NO
identd_flags=NO # E.g. "-bleH"
sasyncd_flags=NO
isakmpd_flags=NO
+iked_flags=NO
ntpd_flags=NO
route6d_flags=NO
rtadvd_flags=NO # e.g. "sis0 sis2"
@@ -22,9 +23,13 @@ spamd_flags=NO
sshd_flags=NO
syslogd_flags="-s /var/run/syslogd.sock"
ftpproxy_flags=NO
+tftpproxy_flags=NO
watchdogd_flags=NO
hostapd_flags=NO
snmpd_flags=NO
+npppd_flags=NO
+ifstated_flags=NO
+relayd_flags=NO
# Disable or set size for /usr/local/ memfs
usrlocal_size=NO # No of 512-byte blocks e.g. "30720" = about 15MB
View
@@ -251,6 +251,10 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
fi
fi
+if [ X"${npppd_flags}" != X"NO" ]; then
+ echo -n ' npppd'; /usr/sbin/npppd ${npppd_flags}
+fi
+
if [ X"${hostapd_flags}" != X"NO" ]; then
echo -n ' hostapd'; /usr/sbin/hostapd ${hostapd_flags}
fi
@@ -265,10 +269,18 @@ if [ X"${spamd_flags}" != X"NO" ]; then
/usr/libexec/spamd-setup -D
fi
+if [ X"${ifstated_flags}" != X"NO" -a -f /etc/ifstated.conf ]; then
+ echo -n ' ifstated'; /usr/sbin/ifstated ${ifstated_flags}
+fi
+
if [ X"${ftpproxy_flags}" != X"NO" ]; then
echo -n ' ftp-proxy'; /usr/sbin/ftp-proxy ${ftpproxy_flags}
fi
+if [ X"${tftpproxy_flags}" != X"NO" ]; then
+ echo -n ' tftp-proxy'; /usr/sbin/tftp-proxy ${tftpproxy_flags}
+fi
+
if [ X"${identd_flags}" != X"NO" ]; then
echo -n ' identd'; /usr/libexec/identd ${identd_flags}
fi
@@ -289,6 +301,10 @@ if [ X"${bgpd_flags}" != X"NO" -a -e /etc/bgpd.conf ]; then
echo -n ' bgpd'; bgpd ${bgpd_flags}
fi
+if [ X"${relayd_flags}" != X"NO" -a -f /etc/relayd.conf ]; then
+ echo -n ' relayd'; relayd ${relayd_flags}
+fi
+
if [ X"${named_flags}" != X"NO" ]; then
if [ ! -f /etc/rndc.key -a -x /usr/sbin/rndc-confgen ]; then
echo -n "rndc-confgen: generating new shared secret... "
@@ -311,23 +327,29 @@ if [ X"${named_flags}" != X"NO" ]; then
fi
if [ X"${sasyncd_flags}" != X"NO" ]; then
- echo 'starting sasyncd'; sasyncd ${sasyncd_flags}
+ echo -n ' sasyncd'; sasyncd ${sasyncd_flags}
fi
if [ X"${isakmpd_flags}" != X"NO" ]; then
+ [ X"${sasyncd_flags}" != X"NO" ] && isakmpd_flags="-S ${isakmpd_flags}"
echo -n ' isakmpd'; isakmpd ${isakmpd_flags}
fi
+if [ X"${iked_flags}" != X"NO" -a -f /etc/iked.conf ]; then
+ [ X"${sasyncd_flags}" != X"NO" ] && iked_flags="-S ${iked_flags}"
+ echo -n ' iked'; iked ${iked_flags}
+fi
+
if [ X"${ipsec}" != X"NO" -a -f /etc/ipsec.conf ]; then
ipsecctl -f /etc/ipsec.conf
fi
if [ X"${ldattach_flags}" != X"NO" -a -n "${ldattach_flags}" ]; then
- echo -n ' ldattach'; ldattach ${ldattach_flags}
+ echo -n ' ldattach'; ldattach ${ldattach_flags}
fi
if [ X"${ntpd_flags}" != X"NO" ]; then
- echo -n ' ntpd'; ntpd $ntpd_flags
+ echo -n ' ntpd'; ntpd $ntpd_flags
fi
if [ X"${sshd_flags}" != X"NO" ]; then
View
11 list
@@ -152,6 +152,7 @@ COPY ${DESTDIR}/sbin/dmesg sbin/dmesg
COPY ${DESTDIR}/sbin/fsck sbin/fsck
COPY ${DESTDIR}/sbin/fsck_ffs sbin/fsck_ffs
COPY ${DESTDIR}/sbin/ifconfig sbin/ifconfig
+COPY ${DESTDIR}/sbin/iked sbin/iked
COPY ${DESTDIR}/sbin/init sbin/init
COPY ${DESTDIR}/sbin/ipsecctl sbin/ipsecctl
COPY ${DESTDIR}/sbin/isakmpd sbin/isakmpd
@@ -168,11 +169,11 @@ COPY ${DESTDIR}/sbin/route sbin/route
COPY ${DESTDIR}/sbin/sysctl sbin/sysctl
COPY ${DESTDIR}/sbin/ttyflags sbin/ttyflags
COPY ${DESTDIR}/sbin/umount sbin/umount
-#COPY ${DESTDIR}/sbin/wicontrol sbin/wicontrol
COPY ${DESTDIR}/usr/bin/awk usr/bin/awk
COPY ${DESTDIR}/usr/bin/basename usr/bin/basename
COPY ${DESTDIR}/usr/bin/crontab usr/bin/crontab
COPY ${DESTDIR}/usr/bin/diff usr/bin/diff
+COPY ${DESTDIR}/usr/bin/dirname usr/bin/dirname
COPY ${DESTDIR}/usr/bin/cut usr/bin/cut
COPY ${DESTDIR}/usr/bin/du usr/bin/du
COPY ${DESTDIR}/usr/bin/env usr/bin/env
@@ -202,6 +203,7 @@ COPY ${DESTDIR}/usr/bin/su usr/bin/su
COPY ${DESTDIR}/usr/bin/systat usr/bin/systat
COPY ${DESTDIR}/usr/bin/tail usr/bin/tail
COPY ${DESTDIR}/usr/bin/tip usr/bin/tip
+COPY ${DESTDIR}/usr/bin/tmux usr/bin/tmux
COPY ${DESTDIR}/usr/bin/top usr/bin/top
COPY ${DESTDIR}/usr/bin/touch usr/bin/touch
COPY ${DESTDIR}/usr/bin/tput usr/bin/tput
@@ -231,14 +233,20 @@ COPY ${DESTDIR}/usr/sbin/dhcrelay usr/sbin/dhcrelay
COPY ${DESTDIR}/usr/sbin/ftp-proxy usr/sbin/ftp-proxy
COPY ${DESTDIR}/usr/sbin/gpioctl usr/sbin/gpioctl
COPY ${DESTDIR}/usr/sbin/hostapd usr/sbin/hostapd
+COPY ${DESTDIR}/usr/sbin/ikectl usr/sbin/ikectl
COPY ${DESTDIR}/usr/sbin/inetd usr/sbin/inetd
+COPY ${DESTDIR}/usr/sbin/ifstated usr/sbin/ifstated
#COPY ${DESTDIR}/usr/sbin/kvm_mkdb usr/sbin/kvm_mkdb
COPY ${DESTDIR}/usr/sbin/mtree usr/sbin/mtree
#COPY ${DESTDIR}/usr/sbin/named usr/sbin/named
COPY ${DESTDIR}/usr/sbin/ndp usr/sbin/ndp
COPY ${DESTDIR}/usr/sbin/ntpd usr/sbin/ntpd
+COPY ${DESTDIR}/usr/sbin/npppd usr/sbin/npppd
+COPY ${DESTDIR}/usr/sbin/npppctl usr/sbin/npppctl
COPY ${DESTDIR}/usr/sbin/ospfd usr/sbin/ospfd
COPY ${DESTDIR}/usr/sbin/ospfctl usr/sbin/ospfctl
+COPY ${DESTDIR}/usr/sbin/relayd usr/sbin/relayd
+COPY ${DESTDIR}/usr/sbin/relayctl usr/sbin/relayctl
COPY ${DESTDIR}/usr/sbin/ripd usr/sbin/ripd
COPY ${DESTDIR}/usr/sbin/ripctl usr/sbin/ripctl
#COPY ${DESTDIR}/usr/sbin/portmap usr/sbin/portmap
@@ -260,6 +268,7 @@ COPY ${DESTDIR}/usr/sbin/syslogd usr/sbin/syslogd
COPY ${DESTDIR}/usr/sbin/tcpdrop usr/sbin/tcpdrop
COPY ${DESTDIR}/usr/sbin/tcpdump usr/sbin/tcpdump
COPY ${DESTDIR}/usr/sbin/tftpd usr/sbin/tftpd
+COPY ${DESTDIR}/usr/sbin/tftp-proxy usr/sbin/tftp-proxy
COPY ${DESTDIR}/usr/sbin/traceroute usr/sbin/traceroute
COPY ${DESTDIR}/usr/sbin/traceroute6 usr/sbin/traceroute6
COPY ${DESTDIR}/usr/sbin/watchdogd usr/sbin/watchdogd

0 comments on commit 2910ff0

Please sign in to comment.