diff options
author | John Crispin <john@openwrt.org> | 2015-07-07 13:47:23 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2015-07-07 13:47:23 +0000 |
commit | 3787c32183570e9fa77284ba1ae62fc84e2f83fe (patch) | |
tree | 9d52e5033851dbaf0da5411e5d88bb85bb254f4d /package/base-files/files/etc/init.d | |
parent | 0e2d9769be9b0b04bee0706f8f7cd493f01d3cee (diff) | |
download | upstream-3787c32183570e9fa77284ba1ae62fc84e2f83fe.tar.gz upstream-3787c32183570e9fa77284ba1ae62fc84e2f83fe.tar.bz2 upstream-3787c32183570e9fa77284ba1ae62fc84e2f83fe.zip |
sysctl: read settings from /etc/sysctl.d/*.conf
This changes makes it possible to store custom settings
in individual files inside the directory /etc/sysctl.d/.
Signed-off-by: Stefan Tomanek <stefan.tomanek+openwrt@wertarbyte.de>
SVN-Revision: 46239
Diffstat (limited to 'package/base-files/files/etc/init.d')
-rwxr-xr-x | package/base-files/files/etc/init.d/sysctl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl index 36e29eabcb..2dfbaf7a6e 100755 --- a/package/base-files/files/etc/init.d/sysctl +++ b/package/base-files/files/etc/init.d/sysctl @@ -3,5 +3,7 @@ START=11 start() { - [ -f /etc/sysctl.conf ] && sysctl -p -e >&- + for CONF in /etc/sysctl.conf /etc/sysctl.d/*.conf; do + [ -f "$CONF" ] && sysctl -p "$CONF" -e >&- + done } |