X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Finit.d%2Fboot;h=c7038f5f3005622037ee8b9c5d12c76d25e34950;hp=c58365234749a848db67500a6742440895a018fd;hb=66b2e06ad617011b2ce2711e7bae43cd7de5cd3e;hpb=f134c8e1d6385368996ffdfa54fd84b6e4abf2ee

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index c583652347..c7038f5f30 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -2,25 +2,70 @@
 # Copyright (C) 2006 OpenWrt.org
 
 START=10
+
+system_config() {
+	local cfg="$1"
+	local hostname
+	
+	config_get hostname "$cfg" hostname
+	echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+
+	config_get conloglevel "$cfg" conloglevel
+	[ -n "$conloglevel" ] && dmesg -n "$conloglevel"
+	
+	config_get timezone "$cfg" timezone 
+	[ -z "$timezone" ] && timezone=UTC
+	echo "$timezone" > /tmp/TZ
+
+	config_get log_ip "$cfg" log_ip
+	config_get log_size "$cfg" log_size
+	config_get log_file "$cfg" log_file
+	# use a shared mem buffer for local default
+	[ -z $log_file -a -z "$log_size" ] && log_size=16
+	syslogd ${log_size:+-C $log_size} ${log_file:+-O $log_file} \
+		${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
-	
-	HOSTNAME=${wan_hostname%%.*}
-	echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
-	
+	[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
+
 	mkdir -p /var/run
 	mkdir -p /var/log
 	mkdir -p /var/lock
+	mkdir -p /var/state
+	mkdir -p /tmp/.uci
+
+	apply_uci_config
+	config_load system
+	config_foreach system_config system
+
+	chown 0700 /tmp/.uci
 	touch /var/log/wtmp
 	touch /var/log/lastlog
+	ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
 	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
-	
-	# manually trigger hotplug before loading modules
+
+	[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
+			--max-children 1 --no-coldplug &
+
+	# 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 net
+		/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug-call net
 	done
-	
+
+	# 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/*
 }