X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Fhotplug.d%2Fiface%2F10-routes;h=d57a5b3c780a93a7e25434daba64d41b2b1039fe;hp=76a406284622c6dab635fadad4e14d97e28aaa69;hb=adedc8b276b5b7feab0c4e0f1fb3391d7dc3458d;hpb=89aafcf9cc2a3e4afa2e82825f880c45b47c0ce2

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..d57a5b3c78 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
@@ -81,7 +84,7 @@ case "$ACTION" in
 		# Save alias references in state vars
 		local aliases
 		config_get aliases "$INTERFACE" aliases
-		[ -z "$aliases" ] || uci_set_state network "$INTERFACE" aliases "$aliases"
+		[ -z "$aliases" ] || uci_toggle_state network "$INTERFACE" aliases "$aliases"
 
 		# Make ip6addr of parent iface the main address again
 		local ip6addr
@@ -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