From: Matthias Schiffer Date: Thu, 12 Apr 2018 15:33:51 +0000 (+0200) Subject: base-files: evaluate /etc/sysctl.d/* before /etc/sysctl.conf X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dbeb780ba423fc5aae66f503cf91b24a31db6d71;p=librecmc%2Flibrecmc.git base-files: evaluate /etc/sysctl.d/* before /etc/sysctl.conf We can use /etc/sysctl.d/* for package-supplied sysctl snippets, giving admins the option to use /etc/sysctl.conf to override settings. Signed-off-by: Matthias Schiffer --- diff --git a/package/base-files/files/etc/hotplug.d/net/00-sysctl b/package/base-files/files/etc/hotplug.d/net/00-sysctl index 7a71652c44..8abe7f8bbd 100644 --- a/package/base-files/files/etc/hotplug.d/net/00-sysctl +++ b/package/base-files/files/etc/hotplug.d/net/00-sysctl @@ -1,7 +1,7 @@ #!/bin/sh if [ "$ACTION" = add ]; then - for CONF in /etc/sysctl.conf /etc/sysctl.d/*.conf; do + for CONF in /etc/sysctl.d/*.conf /etc/sysctl.conf; do [ ! -f "$CONF" ] && continue; sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" "$CONF" | \ sysctl -e -p - | logger -t sysctl diff --git a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl index 65e6aa9925..8722126a66 100755 --- a/package/base-files/files/etc/init.d/sysctl +++ b/package/base-files/files/etc/init.d/sysctl @@ -30,7 +30,7 @@ apply_defaults() { start() { apply_defaults - for CONF in /etc/sysctl.conf /etc/sysctl.d/*.conf; do + for CONF in /etc/sysctl.d/*.conf /etc/sysctl.conf; do [ -f "$CONF" ] && sysctl -p "$CONF" -e >&- done }