aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-11-28 16:13:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-11-28 16:13:23 +0000
commit4dfe6c0658819ed45fb900e18469daa0baf10c48 (patch)
treeba0c51a46a23dc891f3532cc21df1f8c429b7bbc
parentb396a07f797a08eb9a3f19af4fe87b24e080cd06 (diff)
downloadupstream-4dfe6c0658819ed45fb900e18469daa0baf10c48.tar.gz
upstream-4dfe6c0658819ed45fb900e18469daa0baf10c48.tar.bz2
upstream-4dfe6c0658819ed45fb900e18469daa0baf10c48.zip
fix ifup (no longer use the to-be-reverted state of the previous config)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13398 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/sbin/ifup18
1 files changed, 15 insertions, 3 deletions
diff --git a/package/base-files/files/sbin/ifup b/package/base-files/files/sbin/ifup
index 81ec2c0890..96f7bea357 100755
--- a/package/base-files/files/sbin/ifup
+++ b/package/base-files/files/sbin/ifup
@@ -1,11 +1,23 @@
#!/bin/sh
# Copyright (C) 2006 OpenWrt.org
-. /sbin/ifdown "$@"
+/sbin/ifdown "$@"
-config_get iftype "$1" type
-config_get ifname "$1" device
+. /etc/functions.sh
+[ $# = 0 ] && { echo " $0 <group>"; exit; }
+[ "x$1" = "x-a" ] && {
+ [ -e "/tmp/resolv.conf.auto" ] && rm /tmp/resolv.conf.auto
+ config_cb() {
+ [ interface != "$1" -o -z "$2" ] || eval "$0 $2"
+ }
+ config_load network
+ exit
+}
+
+include /lib/network
+scan_interfaces
+config_get ifname "$1" device
for dev in $ifname; do
setup_interface "$dev" "$1"
done