projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[backfire] merge r24194, r25471 (#8845)
[openwrt-10.03/.git]
/
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 9e4128bc95af54fb6cc469a7965c2b16b8d3ddb0..d9bd5cead784ef56d664e25a88548f889b35cd9b 100755
(executable)
--- a/
package/base-files/files/lib/network/config.sh
+++ b/
package/base-files/files/lib/network/config.sh
@@
-3,6
+3,12
@@
# DEBUG="echo"
# DEBUG="echo"
+do_sysctl() {
+ [ -n "$2" ] && \
+ sysctl -n -e -w "$1=$2" >/dev/null || \
+ sysctl -n -e "$1"
+}
+
find_config() {
local iftype device iface ifaces ifn
for ifn in $interfaces; do
find_config() {
local iftype device iface ifaces ifn
for ifn in $interfaces; do
@@
-403,6
+409,7
@@
unbridge() {
for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
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
done
}
}
done
}
}