kea: add init scripts
PATCH v2 1/1 kea: add init scripts
[ Yocto # 14074 ]
Add init scripts for dhcp4,6 and ddns
Signed-off-by akuster <[email protected]>
--
V2]
remove 'status' from usage
add patch to fix ps -p in keactrl.in
--- .../kea/files/fix_pid_keactrl.patch | 22 +++++++++ .../kea/files/kea-dhcp-ddns-server | 46 ++++++++++++++++++ .../kea/files/kea-dhcp4-server | 46 ++++++++++++++++++ .../kea/files/kea-dhcp6-server | 47 +++++++++++++++++++ meta/recipes-connectivity/kea/kea_1.7.10.bb | 14 +++++- 5 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp4-server create mode 100644 meta/recipes-connectivity/kea/files/kea-dhcp6-server
meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch new file +22 -0
@@ -0,0 +1,22 @@ +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]> + +Index: kea-1.7.10/src/bin/keactrl/keactrl.in +=================================================================== +--- kea-1.7.10.orig/src/bin/keactrl/keactrl.in ++++ kea-1.7.10/src/bin/keactrl/keactrl.in +@@ -137,8 +137,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 +- ps -p ${_pid} 1>/dev/null ++ # Use pgrep and grep to check if PID is alive ++ pgrep -v 1 | grep ${_pid} 1>/dev/null + retcode=$? + if [ $retcode -eq 0 ]; then + # No error, so PID IS ALIVE
meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server new file +46 -0
46 lines not on this page · raw message
meta/recipes-connectivity/kea/files/kea-dhcp4-server new file +46 -0
46 lines not on this page · raw message
meta/recipes-connectivity/kea/files/kea-dhcp6-server new file +47 -0
47 lines not on this page · raw message
meta/recipes-connectivity/kea/kea_1.7.10.bb +13 -1
@@ -13,11 +13,18 @@ SRC_URI = "\ file://kea-dhcp4.service \ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ + file://kea-dhcp4-server \ + file://kea-dhcp6-server \ + file://kea-dhcp-ddns-server \ file://fix-multilib-conflict.patch \ + file://fix_pid_keactrl.patch \ " SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" -inherit autotools systemd +inherit autotools systemd update-rc.d + +INITSCRIPT_NAME = "kea-dhcp4-server" +INITSCRIPT_PARAMS = "defaults 30" SYSTEMD_SERVICE_${PN} = "kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service" SYSTEMD_AUTO_ENABLE = "disable"
@@ -44,8 +51,11 @@ do_configure_prepend() { } do_install_append() { + install -d ${D}${sysconfdir}/init.d install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} + install -m 0755 ${WORKDIR}/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
@@ -55,6 +65,8 @@ do_install_append() { rm -rf "${D}${localstatedir}" } +CONFFILES_${PN} = "${sysconfdir}/kea/keactrl.conf" + FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" FILES_${PN} += "${libdir}/hooks/*.so"
Signature · 1 line
2.17.1