Permalink
Browse files

Hook up missing daemons to rc; while at it, clean up there.

  • Loading branch information...
1 parent ad381f0 commit 05acde6ee45850c0e857af0754391235986407d0 Stefan Paletta committed Sep 21, 2013
Showing with 30 additions and 3 deletions.
  1. +5 −0 initial-conf/rc.conf
  2. +25 −3 initial-conf/rc.initial
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
@@ -249,6 +249,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
@@ -263,10 +267,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
@@ -287,6 +299,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... "
@@ -309,23 +325,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

0 comments on commit 05acde6

Please sign in to comment.