fix networking on broadcom and possibly other targets as well (#1658)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7149 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 9 insertions, 11 deletions

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index d5a42e2d7e..e586704a28 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -11,11 +11,17 @@ system_config() {
 	echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
 }
 
+apply_uci_config() {(
+	include /lib/config
+	uci_apply_defaults
+)}
+
 start() {
 	[ -f /proc/mounts ] || /sbin/mount_root
 	[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
 	vconfig set_name_type DEV_PLUS_VID_NO_PAD
-	
+
+	apply_uci_config
 	config_load system
 	config_foreach system_config system
 	
@@ -27,11 +33,12 @@ start() {
 	ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
 	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 	
+	/sbin/hotplug2 --persistent --max-children 1 &
+
 	# the coldplugging of network interfaces needs to happen later, so we do it manually here
 	for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
 		/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug-call net
 	done
-	/sbin/hotplug2 --persistent --max-children 1 &
 
 	# create /dev/root if it doesn't exist
 	[ -e /dev/root ] || {
diff --git a/package/base-files/files/etc/init.d/config b/package/base-files/files/etc/init.d/config
deleted file mode 100755
index 2a14975035..0000000000
--- a/package/base-files/files/etc/init.d/config
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=15
-
-start() {
-	include /lib/config
-	uci_apply_defaults
-}