Merge pull request #1163 from kernelkit/finit-warning

Fix log error at boot about unsupported command

Author: troglobit

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

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 ]; }

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);