Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

base-files: evaluate /etc/sysctl.d/* before /etc/sysctl.conf

Browse source 
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>
This commit is contained in:
Matthias Schiffer 2018-04-12 17:33:51 +02:00
parent 6c7307f133
commit dbeb780ba4
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/files/etc/hotplug.d/net/00-sysctl
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
if [ "$ACTION" = add ]; then 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; [ ! -f "$CONF" ] && continue;
sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" "$CONF" | \ sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" "$CONF" | \
sysctl -e -p - | logger -t sysctl sysctl -e -p - | logger -t sysctl

2
package/base-files/files/etc/init.d/sysctl
View file

@ -30,7 +30,7 @@ apply_defaults() {
start() { start() {
apply_defaults 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 >&- [ -f "$CONF" ] && sysctl -p "$CONF" -e >&-
done done
} }