X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Finit.d%2Fboot;h=528d922a28a61955a9090cc40f98bf7360005ca8;hb=e26af005b57ca0fae2accbdb9528212b4f1b9ea3;hp=8850311829ec42232b08e90ecd90fbc09102d733;hpb=461a3827fb99b1a6b812c6b41b6c40123fcc71b5;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 885031182..528d922a2 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -9,13 +9,23 @@ system_config() {
 	
 	config_get hostname "$cfg" hostname
 	echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+
+	config_get log_ip "$cfg" log_ip 
+	syslogd -C16 ${log_ip:+-L -R $log_ip}
+	klogd
 }
 
+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,13 +37,18 @@ start() {
 	ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
 	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 	
-	# manually trigger hotplug before loading modules
+	/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 5 &
-	echo /sbin/hotplug-call > /proc/sys/kernel/hotplug
+
+	# create /dev/root if it doesn't exist
+	[ -e /dev/root ] || {
+		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
+		[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
+	}
 
 	load_modules /etc/modules.d/*
 }