aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-04-12 17:33:51 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-04-13 10:16:45 +0200
commitdbeb780ba423fc5aae66f503cf91b24a31db6d71 (patch)
tree73ab225b85bac7b5a7fcd26b194718639552ca94
parent6c7307f133c2a60356b0de23aaaabe4ff7674d05 (diff)
downloadupstream-dbeb780ba423fc5aae66f503cf91b24a31db6d71.tar.gz
upstream-dbeb780ba423fc5aae66f503cf91b24a31db6d71.tar.bz2
upstream-dbeb780ba423fc5aae66f503cf91b24a31db6d71.zip
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 <mschiffer@universe-factory.net>
-rw-r--r--package/base-files/files/etc/hotplug.d/net/00-sysctl2
-rwxr-xr-xpackage/base-files/files/etc/init.d/sysctl2
2 files changed, 2 insertions, 2 deletions
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
}