aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-02-25 22:44:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-02-25 22:44:37 +0000
commit73468de8d1fad601c5dc6460cc33c02af47c51f8 (patch)
tree0c5bb844d2fefe02aced2eb37f58155d3fef5beb /package/base-files/files
parente0deefc79372b9fc1c99ba7fcd1c3301a5a2bce4 (diff)
downloadupstream-73468de8d1fad601c5dc6460cc33c02af47c51f8.tar.gz
upstream-73468de8d1fad601c5dc6460cc33c02af47c51f8.tar.bz2
upstream-73468de8d1fad601c5dc6460cc33c02af47c51f8.zip
base-files: fix sysctl handling, do not react on fake ifaces in route hotplug handler
SVN-Revision: 25713
Diffstat (limited to 'package/base-files/files')
-rw-r--r--package/base-files/files/etc/hotplug.d/iface/10-routes7
1 files 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 76a4062846..a36885b871 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