Skip to contentSkip to conversation

kea: add volatile files to create runtime directory

PATCH In review Yi Zhao 2 participants 5 messages Dec 18, 2025

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/3 kea: add volatile files to create runtime directory

Use volatile files to create runtime directories, instead of creating them in systemd unit/initscript files.

---
 .../kea/files/kea-dhcp-ddns.service           |  2 -
 .../kea/files/kea-dhcp4.service               |  3 --
 .../kea/files/kea-dhcp6.service               |  3 --
 .../kea/files/kea.tmpfiles                    |  2 +
 .../kea/files/kea.volatiles                   |  2 +
 meta/recipes-connectivity/kea/kea_3.0.1.bb    | 43 +++++++++++++------
 6 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 meta/recipes-connectivity/kea/files/kea.tmpfiles
 create mode 100644 meta/recipes-connectivity/kea/files/kea.volatiles
meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service +0 -2
index aec6446f0e..fe09ef6437 100644
@@ -5,8 +5,6 @@ After=network-online.target
 After=time-sync.target
 
 [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
 ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf
 
 [Install]
meta/recipes-connectivity/kea/files/kea-dhcp4.service +0 -3
index a2ed4edb59..a48a230654 100644
@@ -5,9 +5,6 @@ After=network-online.target
 After=time-sync.target
 
 [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
 ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf
 
 [Install]
meta/recipes-connectivity/kea/files/kea-dhcp6.service +0 -3
index ed6e017d0c..a441df9ad2 100644
@@ -5,9 +5,6 @@ After=network-online.target
 After=time-sync.target
 
 [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
 ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf
 
 [Install]
meta/recipes-connectivity/kea/files/kea.tmpfiles new file +2 -0
new file mode 100644
index 0000000000..5da74be3a6
@@ -0,0 +1,2 @@
+d /run/kea 0750 root root -
+d /var/lib/kea 0644 root root -
meta/recipes-connectivity/kea/files/kea.volatiles new file +2 -0
new file mode 100644
index 0000000000..d0350e38a6
@@ -0,0 +1,2 @@
+d root root 0750 /var/run/kea none
+d root root 0644 /var/lib/kea none
meta/recipes-connectivity/kea/kea_3.0.1.bb +30 -13

62 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/3 kea: replace keactrl with kea daemons in initscripts

The keactrl script is used to run Kea from installation directory and is primarily intended for developers[1][2]. The initscripts should call kea daemon directly, rather than through the keactrl script.

[1] https://gitlab.isc.org/isc-projects/kea/-/blob/master/src/bin/keactrl/keactrl.in?ref_type=heads#L10
[2] https://kea.readthedocs.io/en/latest/arm/keactrl.html

---
 .../kea/files/kea-dhcp-ddns-server               | 16 ++++++++++------
 .../kea/files/kea-dhcp4-server                   | 16 ++++++++++------
 .../kea/files/kea-dhcp6-server                   | 16 ++++++++++------
 3 files changed, 30 insertions(+), 18 deletions(-)
meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server +10 -6
index 50fe40d439..ebdf6f4dd6 100644
@@ -11,8 +11,9 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="kea-dhcp-ddns-server"
 NAME=kea-dhcp-ddns
-DAEMON=/usr/sbin/keactrl
-DAEMON_ARGS=" -s dhcp_ddns"
+DAEMON=/usr/sbin/kea-dhcp-ddns
+DAEMON_ARGS="-c /etc/kea/kea-dhcp-ddns.conf"
+PIDFILE=/var/run/kea/kea-dhcp-ddns.kea-dhcp-ddns.pid
 
 set -e
 
@@ -25,13 +26,12 @@ set -e
 case "$1" in
   start)
         echo -n "Starting $DESC: "
-        start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS
+        start-stop-daemon -S -b -n $NAME -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS
         echo "done."
         ;;
   stop)
         echo -n "Stopping $DESC: "
-        kpid=`pidof $NAME`
-        kill $kpid
+        start-stop-daemon -K -p $PIDFILE -x $DAEMON
         echo "done."
         ;;
   restart|force-reload)
@@ -39,8 +39,12 @@ case "$1" in
         $0 stop
         $0 start
         ;;
+  status)
+        status $DAEMON
+        exit $?
+        ;;
   *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
         exit 1
         ;;
 esac
meta/recipes-connectivity/kea/files/kea-dhcp4-server +10 -6
index e83e51025d..247f15d7fb 100644
@@ -11,8 +11,9 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="kea-dhcp4-server"
 NAME=kea-dhcp4
-DAEMON=/usr/sbin/keactrl
-DAEMON_ARGS=" -s dhcp4"
+DAEMON=/usr/sbin/kea-dhcp4
+DAEMON_ARGS="-c /etc/kea/kea-dhcp4.conf"
+PIDFILE=/var/run/kea/kea-dhcp4.kea-dhcp4.pid
 
 set -e
 
@@ -25,13 +26,12 @@ set -e
 case "$1" in
   start)
         echo -n "Starting $DESC: "
-        start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS
+        start-stop-daemon -S -b -n $NAME -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS
         echo "done."
         ;;
   stop)
         echo -n "Stopping $DESC: "
-        kpid=`pidof $NAME`
-        kill $kpid
+        start-stop-daemon -K -p $PIDFILE -x $DAEMON
         echo "done."
         ;;
   restart|force-reload)
@@ -39,8 +39,12 @@ case "$1" in
         $0 stop
         $0 start
         ;;
+  status)
+        status $DAEMON
+        exit $?
+        ;;
   *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
         exit 1
         ;;
 esac
meta/recipes-connectivity/kea/files/kea-dhcp6-server +10 -6
index 10f2d22641..c04393ddb8 100644
@@ -12,8 +12,9 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="kea-dhcp6-server"
 NAME=kea-dhcp6
-DAEMON=/usr/sbin/keactrl
-DAEMON_ARGS=" -s dhcp6"
+DAEMON=/usr/sbin/kea-dhcp6
+DAEMON_ARGS="-c /etc/kea/kea-dhcp6.conf"
+PIDFILE=/var/run/kea/kea-dhcp6.kea-dhcp6.pid
 
 set -e
 
@@ -26,13 +27,12 @@ set -e
 case "$1" in
   start)
         echo -n "Starting $DESC: "
-        start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS
+        start-stop-daemon -S -b -n $NAME -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS
         echo "done."
         ;;
   stop)
         echo -n "Stopping $DESC: "
-        kpid=`pidof $NAME`
-        kill $kpid
+        start-stop-daemon -K -p $PIDFILE -x $DAEMON
         echo "done."
         ;;
   restart|force-reload)
@@ -40,8 +40,12 @@ case "$1" in
         $0 stop
         $0 start
         ;;
+  status)
+        status $DAEMON
+        exit $?
+        ;;
   *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
         exit 1
         ;;
 esac
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 3/3 kea: remove keactrl from package

In reply to Yi Zhao

The keactrl script is used to run Kea from installation directory and is primarily intended for developers[1][2]. It should not be shipped to kea package. Remove it before packaging. A related patch is also removed.

[1] https://gitlab.isc.org/isc-projects/kea/-/blob/master/src/bin/keactrl/keactrl.in?ref_type=heads#L10
[2] https://kea.readthedocs.io/en/latest/arm/keactrl.html

---
 .../kea/files/fix_pid_keactrl.patch           | 30 -------------------
 meta/recipes-connectivity/kea/kea_3.0.1.bb    |  7 +++--
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch
meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch deleted +0 -30
deleted file mode 100644
index 9cc91bdddf..0000000000
@@ -1,30 +0,0 @@
-From f5125725e4e2e250ccc78a17a8b77431100e7c15 Mon Sep 17 00:00:00 2001
-From: Armin kuster <[email protected]>
-Date: Wed, 14 Oct 2020 22:48:31 -0700
-Subject: [PATCH] Busybox does not support ps -p so use pgrep
-
-Upstream-Status: Inappropriate [embedded specific]
-Based on changes from Diego Sueiro <[email protected]>
-
-Signed-off-by: Armin kuster <[email protected]>
-
-Refresh to apply on top of 2.6.1.
-
-Signed-off-by: Trevor Gamblin <[email protected]>
----
- src/bin/keactrl/keactrl.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/bin/keactrl/keactrl.in
-+++ b/src/bin/keactrl/keactrl.in
-@@ -157,8 +157,8 @@ check_running() {
-     # Get the PID from the PID file (if it exists)
-     get_pid_from_file "${proc_name}"
-     if [ "${_pid}" -gt 0 ]; then
--        # Use ps to check if PID is alive
--        if ps -p "${_pid}" 1>/dev/null; then
-+        # Use pgrep and grep to check if PID is alive
-+        if pgrep -v 1 | grep ${_pid} 1>/dev/null; then
-             # No error, so PID IS ALIVE
-             _running=1
-         fi
meta/recipes-connectivity/kea/kea_3.0.1.bb +4 -3
index 5c46498d5b..2b4677af51 100644
@@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \
            file://kea.volatiles \
            file://kea.tmpfiles \
            file://fix-multilib-conflict.patch \
-           file://fix_pid_keactrl.patch \
            file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
            file://0001-build-boost-1.89.0-fixes.patch \
            file://0001-meson-use-a-runtime-safe-interpreter-string.patch \
@@ -90,10 +89,12 @@ do_install:append() {
     rm -rf ${D}${datadir}/${BPN}/meson-info
     rm -rf ${D}${runtimedir}
     rm -rf ${D}${localstatedir}
+
+    # Remove keactrl
+    rm -f ${D}${sbindir}/keactrl ${D}${sysconfdir}/kea/keactrl.conf
 }
 
-CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf \
-                   ${sysconfdir}/kea/kea-ctrl-agent.conf \
+CONFFILES:${PN} = "${sysconfdir}/kea/kea-ctrl-agent.conf \
                    ${sysconfdir}/kea/kea-dhcp-ddns.conf \
                    ${sysconfdir}/kea/kea-dhcp4.conf \
                    ${sysconfdir}/kea/kea-dhcp6.conf \
Signature · 1 line
2.34.1
#3 lore raw
In reply to Yi Zhao
Quoted 63 lines · Yi Zhao via lists.openembedded.org

Use volatile files to create runtime directories, instead of creating them in systemd unit/initscript files.

---
 .../kea/files/kea-dhcp-ddns.service           |  2 -
 .../kea/files/kea-dhcp4.service               |  3 --
 .../kea/files/kea-dhcp6.service               |  3 --
 .../kea/files/kea.tmpfiles                    |  2 +
 .../kea/files/kea.volatiles                   |  2 +
 meta/recipes-connectivity/kea/kea_3.0.1.bb    | 43 +++++++++++++------
 6 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 meta/recipes-connectivity/kea/files/kea.tmpfiles
 create mode 100644 meta/recipes-connectivity/kea/files/kea.volatiles
meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service +0 -2
index aec6446f0e..fe09ef6437 100644
@@ -5,8 +5,6 @@ After=network-online.target
 After=time-sync.target
 
 [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
 ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf
 
 [Install]
meta/recipes-connectivity/kea/files/kea-dhcp4.service +0 -3
index a2ed4edb59..a48a230654 100644
@@ -5,9 +5,6 @@ After=network-online.target
 After=time-sync.target
 
 [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
 ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf
 
 [Install]
meta/recipes-connectivity/kea/files/kea-dhcp6.service +0 -3
index ed6e017d0c..a441df9ad2 100644
@@ -5,9 +5,6 @@ After=network-online.target
 After=time-sync.target
 
 [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
 ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf
 
 [Install]
meta/recipes-connectivity/kea/files/kea.tmpfiles new file +0 -0
new file mode 100644
index 0000000000..5da74be3a6

meta/recipes-connectivity/kea/files/kea.tmpfiles line 2

Quoted 2 lines
meta/recipes-connectivity/kea/files/kea.tmpfiles new file +2 -0
@@ -0,0 +1,2 @@
+d /run/kea 0750 root root -
+d /var/lib/kea 0644 root root -

I think it'd be better if we add StateDirectory and RuntimeDirectory to the service file if the lifetime of directory is tied to the unit:
https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#RuntimeDirectory=

Debian also does something similar.

Quoted 88 lines
meta/recipes-connectivity/kea/files/kea.volatiles new file +2 -0
new file mode 100644
index 0000000000..d0350e38a6
@@ -0,0 +1,2 @@
+d root root 0750 /var/run/kea none
+d root root 0644 /var/lib/kea none
meta/recipes-connectivity/kea/kea_3.0.1.bb +30 -14
index 8729b1162e..5c46498d5b 100644
@@ -14,6 +14,8 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \
            file://kea-dhcp4-server \
            file://kea-dhcp6-server \
            file://kea-dhcp-ddns-server \
+           file://kea.volatiles \
+           file://kea.tmpfiles \
            file://fix-multilib-conflict.patch \
            file://fix_pid_keactrl.patch \
            file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
@@ -61,26 +63,41 @@ do_compile:prepend:class-target() {
 }
 
 do_install:append() {
-    install -d ${D}${sysconfdir}/init.d
-    install -d ${D}${systemd_system_unitdir}
-
-    install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
-    install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d
-    sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
-           -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-           ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -d ${D}/${sysconfdir}/default/volatiles
+
+        install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d
+        install -m 0644 ${UNPACKDIR}/kea.volatiles ${D}/${sysconfdir}/default/volatiles/99_kea
+    fi
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${systemd_system_unitdir}
+        install -d ${D}${sysconfdir}/tmpfiles.d
+
+        install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/kea.tmpfiles ${D}/${sysconfdir}/tmpfiles.d/kea.conf
+
+        sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
+            -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+            ${D}${systemd_system_unitdir}/kea-dhcp*service
+    fi
+
     sed -i -e "s:${B}:@abs_top_builddir_placeholder@:g" \
            -e "s:${S}:@abs_top_srcdir_placeholder@:g" \
            ${D}${sbindir}/kea-admin
+
     rm -rf ${D}${datadir}/${BPN}/meson-info
     rm -rf ${D}${runtimedir}
+    rm -rf ${D}${localstatedir}
 }
 
-do_install:append() {
-    rm -rf "${D}${localstatedir}"
-}
-
-CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf"
+CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf \
+                   ${sysconfdir}/kea/kea-ctrl-agent.conf \
+                   ${sysconfdir}/kea/kea-dhcp-ddns.conf \
+                   ${sysconfdir}/kea/kea-dhcp4.conf \
+                   ${sysconfdir}/kea/kea-dhcp6.conf \
+                  "
 
 PACKAGES =+ "${PN}-python"
 FILES:${PN}-python = "${nonarch_libdir}/python*/site-packages/*"
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#228085): https://lists.openembedded.org/g/openembedded-core/message/228085
Mute This Topic: https://lists.openembedded.org/mt/116837599/3616702
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#4 lore raw
Quoted 70 lines · Anuj Mittal
Quoted 62 lines · Yi Zhao via lists.openembedded.org

Use volatile files to create runtime directories, instead of creating them in systemd unit/initscript files.

---
  .../kea/files/kea-dhcp-ddns.service           |  2 -
  .../kea/files/kea-dhcp4.service               |  3 --
  .../kea/files/kea-dhcp6.service               |  3 --
  .../kea/files/kea.tmpfiles                    |  2 +
  .../kea/files/kea.volatiles                   |  2 +
  meta/recipes-connectivity/kea/kea_3.0.1.bb    | 43 +++++++++++++------
  6 files changed, 34 insertions(+), 21 deletions(-)

create mode 100644 meta/recipes-connectivity/kea/files/kea.tmpfiles create mode 100644 meta/recipes-connectivity/kea/files/kea.volatiles

meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service +0 -2
index aec6446f0e..fe09ef6437 100644
@@ -5,8 +5,6 @@ After=network-online.target
  After=time-sync.target
 
  [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
  ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf
 
  [Install]
meta/recipes-connectivity/kea/files/kea-dhcp4.service +0 -3
index a2ed4edb59..a48a230654 100644
@@ -5,9 +5,6 @@ After=network-online.target
  After=time-sync.target
 
  [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
  ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf
 
  [Install]
meta/recipes-connectivity/kea/files/kea-dhcp6.service +0 -3
index ed6e017d0c..a441df9ad2 100644
@@ -5,9 +5,6 @@ After=network-online.target
  After=time-sync.target
 
  [Service]
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/
-ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea
  ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf
 
  [Install]
meta/recipes-connectivity/kea/files/kea.tmpfiles new file +0 -0
new file mode 100644
index 0000000000..5da74be3a6

meta/recipes-connectivity/kea/files/kea.tmpfiles line 2

Quoted 2 lines
meta/recipes-connectivity/kea/files/kea.tmpfiles new file +2 -0
@@ -0,0 +1,2 @@
+d /run/kea 0750 root root -
+d /var/lib/kea 0644 root root -

I think it'd be better if we add StateDirectory and RuntimeDirectory to the service file if the lifetime of directory is tied to the unit:
https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#RuntimeDirectory=

Quoted 1 line

Debian also does something similar.

Thanks. I will try this.

//Yi

Quoted 89 lines
Quoted 89 lines
meta/recipes-connectivity/kea/files/kea.volatiles new file +2 -0
new file mode 100644
index 0000000000..d0350e38a6
@@ -0,0 +1,2 @@
+d root root 0750 /var/run/kea none
+d root root 0644 /var/lib/kea none
meta/recipes-connectivity/kea/kea_3.0.1.bb +30 -14
index 8729b1162e..5c46498d5b 100644
@@ -14,6 +14,8 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \
             file://kea-dhcp4-server \
             file://kea-dhcp6-server \
             file://kea-dhcp-ddns-server \
+           file://kea.volatiles \
+           file://kea.tmpfiles \
             file://fix-multilib-conflict.patch \
             file://fix_pid_keactrl.patch \
             file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
@@ -61,26 +63,41 @@ do_compile:prepend:class-target() {
  }
 
  do_install:append() {
-    install -d ${D}${sysconfdir}/init.d
-    install -d ${D}${systemd_system_unitdir}
-
-    install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
-    install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d
-    sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
-           -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-           ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -d ${D}/${sysconfdir}/default/volatiles
+
+        install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d
+        install -m 0644 ${UNPACKDIR}/kea.volatiles ${D}/${sysconfdir}/default/volatiles/99_kea
+    fi
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${systemd_system_unitdir}
+        install -d ${D}${sysconfdir}/tmpfiles.d
+
+        install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/kea.tmpfiles ${D}/${sysconfdir}/tmpfiles.d/kea.conf
+
+        sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
+            -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+            ${D}${systemd_system_unitdir}/kea-dhcp*service
+    fi
+
      sed -i -e "s:${B}:@abs_top_builddir_placeholder@:g" \
             -e "s:${S}:@abs_top_srcdir_placeholder@:g" \
             ${D}${sbindir}/kea-admin
+
      rm -rf ${D}${datadir}/${BPN}/meson-info
      rm -rf ${D}${runtimedir}
+    rm -rf ${D}${localstatedir}
  }
 
-do_install:append() {
-    rm -rf "${D}${localstatedir}"
-}
-
-CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf"
+CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf \
+                   ${sysconfdir}/kea/kea-ctrl-agent.conf \
+                   ${sysconfdir}/kea/kea-dhcp-ddns.conf \
+                   ${sysconfdir}/kea/kea-dhcp4.conf \
+                   ${sysconfdir}/kea/kea-dhcp6.conf \
+                  "
 
  PACKAGES =+ "${PN}-python"
  FILES:${PN}-python = "${nonarch_libdir}/python*/site-packages/*"
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#228085): https://lists.openembedded.org/g/openembedded-core/message/228085
Mute This Topic: https://lists.openembedded.org/mt/116837599/3616702
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-