peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-30 12:33:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1163 from kernelkit/finit-warning

Browse Source 
Fix log error at boot about unsupported command
This commit is contained in:
Joachim Wiberg
2025-09-29 09:40:11 +02:00
committed by GitHub
parent fe8610b30d 040bd5b10c
commit c59f53eeed
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog.md
+5 -2
View File
@@ -3,10 +3,11 @@ Change Log
All notable changes to the project are documented in this file. All notable changes to the project are documented in this file.
[v25.09.0][UNRELEASED] - [v25.09.0][] - 2025-09-30
------------------------- -------------------------
### Changes ### Changes
- Upgrade Buildroot to 2025.02.6 (LTS) - Upgrade Buildroot to 2025.02.6 (LTS)
- Upgrade Linux kernel to 6.12.46 (LTS) - Upgrade Linux kernel to 6.12.46 (LTS)
- Upgrade libyang to 3.13.5 - 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 - cli: new `terminal reset` and `terminal resize` convenience commands
### Fixes ### Fixes
- Fix #1080: Error message in log from rauc, deprecated 'Install' D-Bus method - 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 - Fix #1100: Reduce DHCP client logging verbosity by 70% and include interface
names in log messages for easier troubleshooting names in log messages for easier troubleshooting
- Fix #1119: CLI UX regression, restore proper behavior for `no enabled` command - Fix #1119: CLI UX regression, restore proper behavior for `no enabled` command
- Fix #1155: `show ospf` commands regression - 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` - Fixes for unicode translation in log and pager outputs as well as `syslogd`
[BPI-R3]: https://wiki.banana-pi.org/Banana_Pi_BPI-R3 [BPI-R3]: https://wiki.banana-pi.org/Banana_Pi_BPI-R3
patches/openresolv/3.13.2/finit-support.patch
+1 -1
View File
@@ -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 /usr/bin/systemctl restart $1.service
fi' fi'
+ elif [ -x /sbin/initctl ]; then + 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 ] && elif [ -x /sbin/rc-service ] &&
{ [ -s /libexec/rc/init.d/softlevel ] || { [ -s /libexec/rc/init.d/softlevel ] ||
[ -s /run/openrc/softlevel ]; } [ -s /run/openrc/softlevel ]; }
src/confd/src/infix-dhcp-server.c
+1 -5
View File
@@ -240,7 +240,6 @@ static void del(const char *subnet, struct lyd_node *cfg)
int prefix_len; int prefix_len;
char line[512]; char line[512];
systemf("initctl -nbq stop dnsmasq");
fremove(DNSMASQ_SUBNET_FMT, subnet_tag(subnet)); fremove(DNSMASQ_SUBNET_FMT, subnet_tag(subnet));
/* Parse subnet/prefix */ /* Parse subnet/prefix */
@@ -369,7 +368,6 @@ static int change(sr_session_ctx_t *session, uint32_t sub_id, const char *module
if (err) if (err)
goto err_done; goto err_done;
} else { } else {
system("initctl -nbq stop dnsmasq"), deleted++;
erase(DNSMASQ_LEASES); erase(DNSMASQ_LEASES);
erase(DNSMASQ_GLOBAL_OPTS); 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: err_done:
if (deleted) if (added || deleted)
system("initctl -nbq restart dnsmasq");
else
system("initctl -nbq touch dnsmasq"); system("initctl -nbq touch dnsmasq");
lyd_free_tree(diff); lyd_free_tree(diff);