rc(8) bits for dhcpleased(8).

OK deraadt

diff --git a/etc/Makefile b/etc/Makefile
index d126e2c..3bf4d84 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.480 2020/09/13 11:29:52 ajacoutot Exp $
+#      $OpenBSD: Makefile,v 1.481 2021/02/26 17:18:41 florian Exp $
 
 .include <bsd.own.mk>
 
@@ -58,9 +58,9 @@ EXAMPLES_600=bgpd.conf doas.conf dvmrpd.conf eigrpd.conf hostapd.conf \
        snmpd.conf vm.conf ypldap.conf
 
 # -r-xr-xr-x
-RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \
-       eigrpd ftpd ftpproxy ftpproxy6 hostapd hotplugd httpd identd ifstated \
-       iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
+RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcpleased dhcrelay dhcrelay6 \
+       dvmrpd eigrpd ftpd ftpproxy ftpproxy6 hostapd hotplugd httpd identd \
+       ifstated iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
        lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
        pflogd portmap rad radiusd rarpd rbootd relayd ripd route6d \
        sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \

diff --git a/etc/rc b/etc/rc
index cd1d026..c55d4da 100644 (file)
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc,v 1.545 2021/02/09 21:42:04 naddy Exp $
+#      $OpenBSD: rc,v 1.546 2021/02/26 17:18:41 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
@@ -441,7 +441,7 @@ fill_baddynamic tcp
 
 sysctl_conf
 
-start_daemon slaacd >/dev/null 2>&1
+start_daemon dhcpleased slaacd >/dev/null 2>&1
 
 echo 'starting network'
 

diff --git a/etc/rc.conf b/etc/rc.conf
index 6509740..2a81806 100644 (file)
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc.conf,v 1.220 2020/01/24 06:17:37 tedu Exp $
+#      $OpenBSD: rc.conf,v 1.221 2021/02/26 17:18:41 florian Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -18,6 +18,7 @@ bgpd_flags=NO
 bootparamd_flags=NO
 cron_flags=
 dhcpd_flags=NO
+dhcpleased_flags=
 dhcrelay_flags=NO      # for normal use: "-i interface [server]"
 dvmrpd_flags=NO
 eigrpd_flags=NO

diff --git a/etc/rc.d/dhcpleased b/etc/rc.d/dhcpleased
new file mode 100644 (file)
index 0000000..f81613d
--- /dev/null
+++ b/etc/rc.d/dhcpleased
@@ -0,0 +1,11 @@
+#!/bin/ksh
+#
+# $OpenBSD: dhcpleased,v 1.1 2021/02/26 17:18:41 florian Exp $
+
+daemon="/sbin/dhcpleased"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1