summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2017-05-29 10:24:07 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2017-05-29 10:24:07 +0000
commit9d016aa50b7adcc9582ba8e3765bdf4b58f87cce (patch)
tree4603d376d644946987554fec7e1334e4ec86fdf7
parent7fb44574648b6f77020a9a1ee08ef912edb213a5 (diff)
rc.d(8) for slaacd
OK phessler, deraadt
-rw-r--r--etc/Makefile4
-rw-r--r--etc/rc4
-rw-r--r--etc/rc.conf3
-rw-r--r--etc/rc.d/slaacd11
4 files changed, 17 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile
index f46dd1f4c62..2c5a6e59864 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.454 2017/04/14 21:37:15 espie Exp $
+# $OpenBSD: Makefile,v 1.455 2017/05/29 10:24:06 florian Exp $
.include <bsd.own.mk>
@@ -55,7 +55,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \
iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \
- rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \
+ rtadvd sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
diff --git a/etc/rc b/etc/rc
index ae73f2ff0e6..aa75b505176 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.496 2017/05/29 09:44:01 deraadt Exp $
+# $OpenBSD: rc,v 1.497 2017/05/29 10:24:06 florian Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -432,7 +432,7 @@ dmesg >/var/run/dmesg.boot
make_keys
echo -n 'starting early daemons:'
-start_daemon syslogd ldattach pflogd nsd rebound unbound ntpd
+start_daemon syslogd ldattach pflogd slaacd nsd rebound unbound ntpd
start_daemon iscsid isakmpd iked sasyncd ldapd npppd
echo '.'
diff --git a/etc/rc.conf b/etc/rc.conf
index 9048478bf80..6555d769c04 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.conf,v 1.213 2017/02/26 16:51:18 matthieu Exp $
+# $OpenBSD: rc.conf,v 1.214 2017/05/29 10:24:06 florian Exp $
# DO NOT EDIT THIS FILE!!
#
@@ -57,6 +57,7 @@ rtadvd_flags=NO # for normal use: list of interfaces
# be sure to set net.inet6.ip6.forwarding=1
sasyncd_flags=NO
sensorsd_flags=NO
+slaacd_flags=NO
slowcgi_flags=NO
smtpd_flags=
sndiod_flags=
diff --git a/etc/rc.d/slaacd b/etc/rc.d/slaacd
new file mode 100644
index 00000000000..7790863b9b1
--- /dev/null
+++ b/etc/rc.d/slaacd
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: slaacd,v 1.1 2017/05/29 10:24:06 florian Exp $
+
+daemon="/usr/sbin/slaacd"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1