Author: blogic Date: 2015-07-07 15:47:23 +0200 (Tue, 07 Jul 2015) New Revision: 46239
Added: trunk/package/base-files/files/etc/sysctl.d/ trunk/package/base-files/files/etc/sysctl.d/local.conf Modified: trunk/package/base-files/Makefile trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl trunk/package/base-files/files/etc/init.d/sysctl Log: 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 <[email protected]> Modified: trunk/package/base-files/Makefile =================================================================== --- trunk/package/base-files/Makefile 2015-07-07 13:47:17 UTC (rev 46238) +++ trunk/package/base-files/Makefile 2015-07-07 13:47:23 UTC (rev 46239) @@ -55,6 +55,8 @@ /etc/config/ /etc/dropbear/ /etc/crontabs/ +/etc/sysctl.d/local.conf +/etc/sysctl.d/ $(call $(TARGET)/conffiles) endef Modified: trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl =================================================================== --- trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl 2015-07-07 13:47:17 UTC (rev 46238) +++ trunk/package/base-files/files/etc/hotplug.d/net/00-sysctl 2015-07-07 13:47:23 UTC (rev 46239) @@ -1,6 +1,9 @@ #!/bin/sh -if [ -f /etc/sysctl.conf ] && [ "$ACTION" = add ]; then - sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" /etc/sysctl.conf | \ - sysctl -e -p - | logger -t sysctl +if [ "$ACTION" = add ]; then + for CONF in /etc/sysctl.conf /etc/sysctl.d/*.conf; do + [ ! -f "$CONF" ] && continue; + sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" "$CONF" | \ + sysctl -e -p - | logger -t sysctl + done fi Modified: trunk/package/base-files/files/etc/init.d/sysctl =================================================================== --- trunk/package/base-files/files/etc/init.d/sysctl 2015-07-07 13:47:17 UTC (rev 46238) +++ trunk/package/base-files/files/etc/init.d/sysctl 2015-07-07 13:47:23 UTC (rev 46239) @@ -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 } Added: trunk/package/base-files/files/etc/sysctl.d/local.conf =================================================================== --- trunk/package/base-files/files/etc/sysctl.d/local.conf (rev 0) +++ trunk/package/base-files/files/etc/sysctl.d/local.conf 2015-07-07 13:47:23 UTC (rev 46239) @@ -0,0 +1 @@ +# local sysctl settings can be stored in this directory _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
