[packages] 6tunnel: move init/config files to the right place

[openwrt.git] / package / base-files / files / etc / init.d / boot

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 0d7e11c..c0b6192 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -9,31 +9,50 @@ system_config() {
        
        config_get hostname "$cfg" hostname
        echo "${hostname:-OpenWrt}" > /proc/sys/kernel/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 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
 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
        
        mkdir -p /var/run
        mkdir -p /var/log
        mkdir -p /var/lock
        config_load system
        config_foreach system_config system
        
        mkdir -p /var/run
        mkdir -p /var/log
        mkdir -p /var/lock

+       mkdir -p /var/state

        touch /var/log/wtmp
        touch /var/log/lastlog
        touch /var/log/wtmp
        touch /var/log/lastlog

-       ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+       ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf

        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe

-       
-       # manually trigger hotplug before loading modules
+
+       /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-call net
        done
        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 &
-       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/*
 }
 
        load_modules /etc/modules.d/*
 }