aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-05-27 23:04:56 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-05-27 23:04:56 +0000
commitc0820d3261a81a19c99e9c2a0b4595a5f6465e37 (patch)
tree5bde37ef08e354f2cf90bf5c9166168ea9038842 /package
parentc42a8611fcc1937d78849984af4e9f521b6831b3 (diff)
downloadupstream-c0820d3261a81a19c99e9c2a0b4595a5f6465e37.tar.gz
upstream-c0820d3261a81a19c99e9c2a0b4595a5f6465e37.tar.bz2
upstream-c0820d3261a81a19c99e9c2a0b4595a5f6465e37.zip
base-files: respect .auto option when running coldplug_interface_*() hooks on boot
SVN-Revision: 21588
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/network5
2 files changed, 5 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1a92a59d9d..9eab5e544e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=44
+PKG_RELEASE:=45
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index d60d41a64e..9d4904ae43 100755
--- a/package/base-files/files/etc/init.d/network
+++ b/package/base-files/files/etc/init.d/network
@@ -23,7 +23,10 @@ boot() {
local proto
config_get proto "$ifc" proto
- type "coldplug_interface_$proto" >/dev/null && \
+ local auto
+ config_get_bool auto "$ifc" auto 1
+
+ type "coldplug_interface_$proto" >/dev/null && [ "$auto" = 1 ] && \
coldplug_interface_$proto "$ifc"
done
}