From acca7eadc4db7d60971655b80e9208437e046bfb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 25 Mar 2013 18:43:30 +0000 Subject: [PATCH] package/base-files: change sysctl handling Move /etc/init.d/sysctl to index 00 and add hotplug script that applies interface specific sysctls for interfaces that only appear later - this allows to reliably configure per-interface parameters in sysctl.conf, e.g. to disable ipv6 autoconfig on a specific iface. SVN-Revision: 36129 --- package/base-files/Makefile | 2 +- package/base-files/files/etc/hotplug.d/net/00-sysctl | 6 ++++++ package/base-files/files/etc/init.d/sysctl | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 package/base-files/files/etc/hotplug.d/net/00-sysctl diff --git a/package/base-files/Makefile b/package/base-files/Makefile index fcc24e5282..acd5e2e198 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=136 +PKG_RELEASE:=137 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host diff --git a/package/base-files/files/etc/hotplug.d/net/00-sysctl b/package/base-files/files/etc/hotplug.d/net/00-sysctl new file mode 100644 index 0000000000..5d9da8ac06 --- /dev/null +++ b/package/base-files/files/etc/hotplug.d/net/00-sysctl @@ -0,0 +1,6 @@ +#!/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 +fi diff --git a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl index 2397790555..beeb79f7e6 100755 --- a/package/base-files/files/etc/init.d/sysctl +++ b/package/base-files/files/etc/init.d/sysctl @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org -START=99 +START=0 start() { [ -f /etc/sysctl.conf ] && sysctl -p -e >&- }