From 0da4578362ca4390a29b5e28cb628d351f115f9e Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 16 Mar 2023 15:46:29 +0100 Subject: [PATCH] board/common: allow lldpd to run by default in NETCONF mode Signed-off-by: Joachim Wiberg --- board/common/rootfs/lib/infix/clean-etc | 2 +- .../skeleton/etc/finit.d/available/lldpd.conf | 2 +- src/mech/src/ietf-system/ietf-system.c | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/board/common/rootfs/lib/infix/clean-etc b/board/common/rootfs/lib/infix/clean-etc index 596bd51b..b2c998f5 100755 --- a/board/common/rootfs/lib/infix/clean-etc +++ b/board/common/rootfs/lib/infix/clean-etc @@ -10,7 +10,7 @@ rm -rf /etc/network/interfaces* #...except for some core services reserved() { - for svc in clixon getty nginx sysklogd; do + for svc in clixon getty lldpd nginx sysklogd; do [ "$1" = "${svc}.conf" ] && return 0 done diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf index 08ea060a..9fd73d83 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/lldpd.conf @@ -1,3 +1,3 @@ service if: [2345789] log:prio:daemon.info,tag:lldpd \ - env:-/etc/default/lldpd \ + env:-/etc/default/lldpd \ lldpd -d $LLDPD_ARGS -- LLDP daemon (IEEE 802.1ab) diff --git a/src/mech/src/ietf-system/ietf-system.c b/src/mech/src/ietf-system/ietf-system.c index 296bbb4c..adcc66d7 100644 --- a/src/mech/src/ietf-system/ietf-system.c +++ b/src/mech/src/ietf-system/ietf-system.c @@ -24,6 +24,11 @@ static bool is_true(cxobj *xp, char *name) return false; } +static int sys_reload_services(void) +{ + return system("initctl -nbq touch sysklogd lldpd"); +} + int ietf_sys_tr_begin(clicon_handle h, transaction_data td) { return aug_load(aug); @@ -59,7 +64,7 @@ int ietf_sys_tr_commit_hostname(cxobj *src, cxobj *tgt) free(old); if (src) - err = err ? : system("initctl -nbq touch sysklogd"); + err = err ? : sys_reload_services(); return err; }