diff options
| author |   jakob <jakob@openbsd.org> | 2010-10-01 20:51:32 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2010-10-01 20:51:32 +0000 |
| commit | 481f977cdd2996d6551ef0fb9cf2104df14d1d2a (patch) | |
| tree | e27cdc175eefc12b81670b4ce2651edce9de29d2 | |
| parent | fix more nsd-zonec references (diff) | |
| download | wireguard-openbsd-481f977cdd2996d6551ef0fb9cf2104df14d1d2a.tar.xz wireguard-openbsd-481f977cdd2996d6551ef0fb9cf2104df14d1d2a.zip | |
start nsd(8); ok deraadt
| -rw-r--r-- | etc/rc | 10 | ||||
| -rw-r--r-- | etc/rc.conf | 3 |
2 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.341 2010/09/06 17:10:19 naddy Exp $ +# $OpenBSD: rc,v 1.342 2010/10/01 20:51:32 jakob Exp $ # System startup script run by init on autoboot # or after single-user. @@ -340,6 +340,10 @@ if [ X"${named_flags}" != X"NO" ]; then rm -f /var/named/dev/log syslogd_flags="${syslogd_flags} -a /var/named/dev/log" fi +if [ X"${nsd_flags}" != X"NO" ]; then + rm -f /var/nsd/dev/log + syslogd_flags="${syslogd_flags} -a /var/nsd/dev/log" +fi if [ -d /var/empty ]; then rm -f /var/empty/dev/log mkdir -p -m 0555 /var/empty/dev @@ -371,6 +375,10 @@ if [ X"${named_flags}" != X"NO" ]; then echo 'starting named'; named $named_flags fi +if [ X"${nsd_flags}" != X"NO" ]; then + echo 'starting nsd'; nsd $nsd_flags +fi + if [ ! -f /etc/isakmpd/private/local.key ]; then echo -n "openssl: generating new isakmpd/iked RSA key... " if /usr/sbin/openssl genrsa -out /etc/isakmpd/private/local.key 2048 \ diff --git a/etc/rc.conf b/etc/rc.conf index e19742b0078..8074ceede3f 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.139 2010/07/29 13:55:48 jmc Exp $ +# $OpenBSD: rc.conf,v 1.140 2010/10/01 20:51:32 jakob Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags ldpd_flags=NO # for normal use: "" @@ -16,6 +16,7 @@ bootparamd_flags=NO # for normal use: "" rbootd_flags=NO # for normal use: "" sshd_flags="" # for normal use: "" named_flags=NO # for normal use: "" +nsd_flags=NO # for normal use: "" rdate_flags=NO # for normal use: [RFC868-host] or [-n RFC2030-host] timed_flags=NO # for normal use: "" ldattach_flags=NO # for normal use: "[options] linedisc cua-device" |