base-files: use procd for sysctl

Switch init to use procd, and also add a reload trigger if the config
file '/etc/config/sysctl' gets changed.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2022-11-25 10:15:33 +01:00
parent 8767ba8698
commit eab6e08d08

View File

@ -2,6 +2,7 @@
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
START=11 START=11
USE_PROCD=1
apply_defaults() { apply_defaults() {
local mem="$(awk '/^MemTotal:/ {print $2}' /proc/meminfo)" local mem="$(awk '/^MemTotal:/ {print $2}' /proc/meminfo)"
@ -68,11 +69,19 @@ apply_uci() {
config_foreach handle_sysctl sysctl "/tmp/run/sysctl.d/01-uci.conf" config_foreach handle_sysctl sysctl "/tmp/run/sysctl.d/01-uci.conf"
} }
start() { reload_service() {
apply_defaults
[ -f /tmp/sysctl-default.conf ] || sysctl -a 1>/tmp/sysctl-default.conf 2>/dev/null
apply_uci apply_uci
for CONF in /etc/sysctl.d/*.conf /etc/sysctl.conf /tmp/run/sysctl.d/*.conf; do for CONF in /etc/sysctl.d/*.conf /etc/sysctl.conf /tmp/run/sysctl.d/*.conf; do
[ -f "$CONF" ] && sysctl -e -p "$CONF" >&- [ -f "$CONF" ] && sysctl -e -p "$CONF" >&-
done done
} }
service_triggers() {
procd_add_reload_trigger "sysctl"
}
start_service() {
apply_defaults
[ -f /tmp/sysctl-default.conf ] || sysctl -a 1>/tmp/sysctl-default.conf 2>/dev/null
reload_service
}