From 13bfc6e1cffbe40f512c585bb9b272d899f0f90e Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 25 Feb 2011 22:44:37 +0000 Subject: [package] base-files: fix sysctl handling, do not react on fake ifaces in route hotplug handler git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25713 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/hotplug.d/iface/10-routes | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes index 76a406284..a36885b87 100644 --- a/package/base-files/files/etc/hotplug.d/iface/10-routes +++ b/package/base-files/files/etc/hotplug.d/iface/10-routes @@ -68,6 +68,9 @@ add_route6() { ${mtu:+mss "$mtu"} } +# Skip fake devices (e.g. relayd) +grep -qs "^ *$DEVICE:" /proc/net/dev || exit 0 + case "$ACTION" in ifup) include /lib/network @@ -108,14 +111,14 @@ case "$ACTION" in logger -t ifup "Allowing Router Advertisements on $INTERFACE ($DEVICE)" accept_ra=2 } - do_sysctl "net.ipv6.conf.$INTERFACE.accept_ra" $accept_ra + do_sysctl "net.ipv6.conf.$DEVICE.accept_ra" $accept_ra config_get_bool send_rs "$INTERFACE" send_rs $send_rs [ $send_rs -eq 0 ] || { logger -t ifup "Enabling Router Solicitations on $INTERFACE ($DEVICE)" send_rs=2 } - do_sysctl "net.ipv6.conf.$INTERFACE.forwarding" $send_rs + do_sysctl "net.ipv6.conf.$DEVICE.forwarding" $send_rs # Setup routes -- cgit v1.2.3