package/base-files: use new service wrapper

[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 6ecddfb..44b53fe 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -1,43 +1,58 @@
 #!/bin/sh /etc/rc.common
 #!/bin/sh /etc/rc.common

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 
 START=10
 
 START=10

+STOP=98

 
 system_config() {
        local cfg="$1"
 
 system_config() {
        local cfg="$1"

-       local hostname
-       
-       config_get hostname "$cfg" hostname
-       echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+
+       local hostname conloglevel timezone
+
+       config_get hostname "$cfg" hostname 'OpenWrt'
+       echo "$hostname" > /proc/sys/kernel/hostname

 
        config_get conloglevel "$cfg" conloglevel
 
        config_get conloglevel "$cfg" conloglevel

-       [ -n "$conloglevel" ] && dmesg -n "$conloglevel"
+       config_get buffersize "$cfg" buffersize
+       [ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}

        
        

-       config_get timezone "$cfg" timezone 
-       [ -z "$timezone" ] && timezone=UTC
+       config_get timezone "$cfg" timezone 'UTC'

        echo "$timezone" > /tmp/TZ
 
        echo "$timezone" > /tmp/TZ
 

-       config_get log_ip "$cfg" log_ip 
-       config_get log_size "$cfg" log_size
-       config_get log_port "$cfg" log_port
-       [ -x /sbin/syslogd ] && syslogd -C${log_size:-16} ${log_ip:+-L -R $log_ip${log_port:+:$log_port}}
-       [ -x /sbin/klogd ] && klogd
+       config_get zonename "$cfg" zonename
+       [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime
+
+       if [ -x /sbin/syslogd ]; then
+               local args log_ip log_size log_port log_type log_file
+               config_get log_ip "$cfg" log_ip 
+               config_get log_size "$cfg" log_size 16
+               config_get log_port "$cfg" log_port 514
+               config_get log_type "$cfg" log_type circular
+               config_get log_file "$cfg" log_file "/var/log/messages"
+               args="${log_ip:+-L -R ${log_ip}:${log_port}} ${conloglevel:+-l $conloglevel}"
+               if [ "$log_type" = "file" ]; then
+                       args="$args -s $log_size -O $log_file -S"
+               else
+                       args="$args -C${log_size}"
+               fi
+               service_start /sbin/syslogd $args
+       fi
+       if [ -x /sbin/klogd ]; then
+               config_get klogconloglevel "$cfg" klogconloglevel
+               args="${klogconloglevel:+-c $klogconloglevel}"
+               service_start /sbin/klogd $args
+       fi

 }
 
 }
 

-apply_uci_config() {(
-       include /lib/config
-       uci_apply_defaults
-)}
+apply_uci_config() {
+       sh -c '. /etc/functions.sh; include /lib/config; uci_apply_defaults'
+}

 
 start() {
        [ -f /proc/mounts ] || /sbin/mount_root
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
        [ -f /proc/net/vlan/config ] && 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
        [ -f /proc/net/vlan/config ] && 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
        mkdir -p /var/run
        mkdir -p /var/log
        mkdir -p /var/lock


@@ -48,11 +63,25 @@ start() {
        touch /var/log/lastlog
        touch /tmp/resolv.conf.auto
        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
        touch /var/log/lastlog
        touch /tmp/resolv.conf.auto
        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf

+       grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug

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

+       load_modules /etc/modules.d/*
+
+       /sbin/wifi detect > /tmp/wireless.tmp
+       [ -s /tmp/wireless.tmp ] && {
+               cat /tmp/wireless.tmp >> /etc/config/wireless
+       }
+       rm -f /tmp/wireless.tmp
+
+       apply_uci_config
+       config_load system
+       config_foreach system_config system
+

        killall -q hotplug2
        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
                        --set-worker /lib/hotplug2/worker_fork.so \
        killall -q hotplug2
        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
                        --set-worker /lib/hotplug2/worker_fork.so \

+                       --set-rules-file /etc/hotplug2.rules \

                        --max-children 1 >/dev/null 2>&1 &
 
        # the coldplugging of network interfaces needs to happen later, so we do it manually here
                        --max-children 1 >/dev/null 2>&1 &
 
        # the coldplugging of network interfaces needs to happen later, so we do it manually here


@@ -61,10 +90,18 @@ start() {
        done
 
        # create /dev/root if it doesn't exist
        done
 
        # create /dev/root if it doesn't exist

-       [ -e /dev/root ] || {
+       [ -e /dev/root -o -h /dev/root ] || {

                rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
                [ -n "$rootdev" ] && ln -s "$rootdev" /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/*
+       # another round of USB coldplugging to kick devices into operation which lacked drivers before
+       for dev in /sys/bus/usb/devices/*/uevent; do
+               [ -e "$dev" ] && echo -n add > "$dev"
+       done
+}
+
+stop() {
+       service_stop /sbin/klogd
+       service_stop /sbin/syslogd

 }
 }