etc bits for dhcp6leased

looks correct to deraadt

diff --git a/etc/Makefile b/etc/Makefile
index 3d157d8..5bac711 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.488 2024/02/29 22:21:21 bluhm Exp $
+#      $OpenBSD: Makefile,v 1.489 2024/06/03 10:06:35 florian Exp $
 
 .include <bsd.own.mk>
 
@@ -58,12 +58,12 @@ 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 bgplgd 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 resolvd ripd route6d \
-       sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
+RCDAEMONS=amd apmd bgpd bgplgd bootparamd cron dhcpd dhcpleased dhcp6leased \
+       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 resolvd \
+       ripd route6d sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
        spamlogd sshd statd syslogd tftpd tftpproxy unbound \
        unwind vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
 

diff --git a/etc/rc b/etc/rc
index 537a234..85250cc 100644 (file)
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc,v 1.575 2024/05/17 00:33:43 deraadt Exp $
+#      $OpenBSD: rc,v 1.576 2024/06/03 10:06:35 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
@@ -633,7 +633,7 @@ run_upgrade_script sysmerge
 echo -n 'starting network daemons:'
 start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
 start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d
-start_daemon rad hostapd lpd smtpd slowcgi bgplgd httpd ftpd
+start_daemon dhcp6leased rad hostapd lpd smtpd slowcgi bgplgd httpd ftpd
 start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd
 start_daemon rbootd mopd vmd spamd spamlogd sndiod
 echo '.'

diff --git a/etc/rc.conf b/etc/rc.conf
index d132601..163aac1 100644 (file)
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc.conf,v 1.227 2022/09/26 00:29:55 kn Exp $
+#      $OpenBSD: rc.conf,v 1.228 2024/06/03 10:06:35 florian Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -19,6 +19,7 @@ bgplgd_flags=NO
 bootparamd_flags=NO
 cron_flags=
 dhcpd_flags=NO
+dhcp6leased_flags=NO
 dhcpleased_flags=
 dhcrelay_flags=NO      # for normal use: "-i interface [server]"
 dvmrpd_flags=NO

diff --git a/etc/rc.d/dhcp6leased b/etc/rc.d/dhcp6leased
new file mode 100644 (file)
index 0000000..99a2986
--- /dev/null
+++ b/etc/rc.d/dhcp6leased
@@ -0,0 +1,16 @@
+#!/bin/ksh
+#
+# $OpenBSD: dhcp6leased,v 1.1 2024/06/03 10:06:35 florian Exp $
+
+daemon="/sbin/dhcp6leased"
+
+. /etc/rc.d/rc.subr
+
+rc_configtest() {
+       # use rc_exec here since daemon_flags may contain arguments with spaces
+       rc_exec "${daemon} -n ${daemon_flags}"
+}
+
+rc_reload=NO
+
+rc_cmd $1