From 40755424ee7486e774bcb0ca7582c4bdcb846408 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 27 Sep 2025 07:06:30 +0200 Subject: [PATCH 1/3] Fix error in log during boot about unsupported command Sep 27 04:10:06 infix finit[1]: api_cb():Unsupported command (cmd: 13, data: dnsmasq) in runlevel S and 6/0. Fixes #1161 Signed-off-by: Joachim Wiberg --- patches/openresolv/3.13.2/finit-support.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/openresolv/3.13.2/finit-support.patch b/patches/openresolv/3.13.2/finit-support.patch index 6b9be23e..26f383b4 100644 --- a/patches/openresolv/3.13.2/finit-support.patch +++ b/patches/openresolv/3.13.2/finit-support.patch @@ -6,7 +6,7 @@ diff -ru openresolv-3.12.0.orig/resolvconf.in openresolv-3.12.0/resolvconf.in /usr/bin/systemctl restart $1.service fi' + elif [ -x /sbin/initctl ]; then -+ RESTARTCMD="/sbin/initctl -bnq restart \$1" ++ RESTARTCMD="runlevel >/dev/null 2>&1 && /sbin/initctl -bnq restart \$1" elif [ -x /sbin/rc-service ] && { [ -s /libexec/rc/init.d/softlevel ] || [ -s /run/openrc/softlevel ]; } From bb07f87f9c8762c20cb501dbd88ac53365c2081c Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 27 Sep 2025 07:25:03 +0200 Subject: [PATCH 2/3] confd: simplify dnsmasq management during DHCP server reconf Signed-off-by: Joachim Wiberg --- src/confd/src/infix-dhcp-server.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/confd/src/infix-dhcp-server.c b/src/confd/src/infix-dhcp-server.c index a0bce16f..91302b10 100644 --- a/src/confd/src/infix-dhcp-server.c +++ b/src/confd/src/infix-dhcp-server.c @@ -240,7 +240,6 @@ static void del(const char *subnet, struct lyd_node *cfg) int prefix_len; char line[512]; - systemf("initctl -nbq stop dnsmasq"); fremove(DNSMASQ_SUBNET_FMT, subnet_tag(subnet)); /* Parse subnet/prefix */ @@ -369,7 +368,6 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module if (err) goto err_done; } else { - system("initctl -nbq stop dnsmasq"), deleted++; erase(DNSMASQ_LEASES); erase(DNSMASQ_GLOBAL_OPTS); @@ -382,9 +380,7 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module } err_done: - if (deleted) - system("initctl -nbq restart dnsmasq"); - else + if (added || deleted) system("initctl -nbq touch dnsmasq"); lyd_free_tree(diff); From 040bd5b10ca17a298304a556e4ce231a571fac52 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 27 Sep 2025 10:07:06 +0200 Subject: [PATCH 3/3] doc: update changelog, error in log message, and prep for release [skip ci] Signed-off-by: Joachim Wiberg --- doc/ChangeLog.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index 222c013c..7ead2f71 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -3,10 +3,11 @@ Change Log All notable changes to the project are documented in this file. -[v25.09.0][UNRELEASED] - +[v25.09.0][] - 2025-09-30 ------------------------- ### Changes + - Upgrade Buildroot to 2025.02.6 (LTS) - Upgrade Linux kernel to 6.12.46 (LTS) - Upgrade libyang to 3.13.5 @@ -20,12 +21,14 @@ All notable changes to the project are documented in this file. - cli: new `terminal reset` and `terminal resize` convenience commands ### Fixes + - Fix #1080: Error message in log from rauc, deprecated 'Install' D-Bus method - Fix #1100: Reduce DHCP client logging verbosity by 70% and include interface names in log messages for easier troubleshooting - Fix #1119: CLI UX regression, restore proper behavior for `no enabled` command - Fix #1155: `show ospf` commands regression -- Fix #1150: show-legacy wrapper permissions +- Fix #1150: `show-legacy` wrapper permissions +- Fix #1161: error in log during boot about unsupported command - Fixes for unicode translation in log and pager outputs as well as `syslogd` [BPI-R3]: https://wiki.banana-pi.org/Banana_Pi_BPI-R3