aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-16 00:01:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-16 00:01:33 +0000
commit4f16e9cc3e2c187d19b24785a55ce30a892efd68 (patch)
tree2f0c604247fa6fd86171a5e3398a4a662f99cb06 /package/base-files/files/lib
parent8e2643a8b517b0ff5030f05020c48fc7bc0e85c2 (diff)
downloadupstream-4f16e9cc3e2c187d19b24785a55ce30a892efd68.tar.gz
upstream-4f16e9cc3e2c187d19b24785a55ce30a892efd68.tar.bz2
upstream-4f16e9cc3e2c187d19b24785a55ce30a892efd68.zip
keep track of the network interface states (stored in uci format in /var/state/network, overlay over /etc/config/network)
SVN-Revision: 7643
Diffstat (limited to 'package/base-files/files/lib')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 8e19a6e996..c6d909fd0a 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -74,9 +74,7 @@ prepare_interface() {
# if we're called for the bridge interface itself, don't bother trying
# to create any interfaces here. The scripts have already done that, otherwise
# the bridge interface wouldn't exist.
- [ "br-$config" = "$iface" ] && return 0;
-
- [ -f "$iface" ] && return 0;
+ [ "br-$config" = "$iface" -o -f "$iface" ] && return 0;
ifconfig "$iface" 2>/dev/null >/dev/null && {
# make sure the interface is removed from any existing bridge and brought down
@@ -155,9 +153,11 @@ setup_interface() {
[ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
[ -z "$gateway" ] || $DEBUG route add default gw "$gateway"
[ -z "$bcast" ] || $DEBUG ifconfig "$iface" broadcast "$bcast"
- [ -z "$dns" -o -f /tmp/resolv.conf.auto ] || {
+ [ -z "$dns" ] || {
for ns in $dns; do
- echo "nameserver $ns" >> /tmp/resolv.conf.auto
+ grep "$ns" /tmp/resolv.conf.auto 2>/dev/null >/dev/null || {
+ echo "nameserver $ns" >> /tmp/resolv.conf.auto
+ }
done
}