X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/414b1d969f43655ec7e612db9d2b1c399dc8a433..2e230262d0b53b45998711a0132f798816214616:/package/base-files/files/lib/network/config.sh

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index b59b1f232..def156290 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -170,11 +170,6 @@ prepare_interface() {
 			local macaddr
 			config_get macaddr "$config" macaddr
 			[ -x /usr/sbin/brctl ] && {
-				# Disable IPv6 for bridge ports
-				do_sysctl net.ipv6.conf.$iface.disable_ipv6 1
-				[ "${iface##wlan}" != "$iface" ] && \
-					do_sysctl net.ipv6.conf.mon.$iface.disable_ipv6 1
-
 				ifconfig "br-$config" 2>/dev/null >/dev/null && {
 					local newdevs devices
 					config_get devices "$config" device
@@ -183,6 +178,7 @@ prepare_interface() {
 					done
 					uci_set_state network "$config" device "$newdevs"
 					$DEBUG ifconfig "$iface" 0.0.0.0
+					$DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
 					$DEBUG brctl addif "br-$config" "$iface"
 					# Bridge existed already. No further processing necesary
 				} || {
@@ -192,6 +188,7 @@ prepare_interface() {
 					$DEBUG brctl setfd "br-$config" 0
 					$DEBUG ifconfig "br-$config" up
 					$DEBUG ifconfig "$iface" 0.0.0.0
+					$DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
 					$DEBUG brctl addif "br-$config" "$iface"
 					$DEBUG brctl stp "br-$config" $stp
 					# Creating the bridge here will have triggered a hotplug event, which will
@@ -363,7 +360,7 @@ setup_interface() {
 			# additional request options
 			local opt dhcpopts
 			for opt in $reqopts; do
-				append dhcpopts -O "$opt"
+				append dhcpopts "-O $opt"
 			done
 
 			# don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
@@ -419,9 +416,7 @@ unbridge() {
 
 		for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
 			brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
-			do_sysctl net.ipv6.conf.$dev.disable_ipv6 0
-			[ "${dev##wlan}" != "$dev" ] && \
-				do_sysctl net.ipv6.conf.mon.$dev.disable_ipv6 0
+			do_sysctl "net.ipv6.conf.$dev.disable_ipv6" 0
 		done
 	}
 }