base-files: Make /etc/init.d/boot restartable

[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 43837a8..ffcc9f7 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -7,7 +7,7 @@ STOP=98
 system_config() {
        local cfg="$1"
 
-       local hostname conloglevel timezone
+       local hostname conloglevel buffersize timezone zonename
 
        config_get hostname "$cfg" hostname 'OpenWrt'
        echo "$hostname" > /proc/sys/kernel/hostname
@@ -24,27 +24,6 @@ system_config() {
 
        # apply timezone to kernel
        date -k
-
-       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() {
@@ -52,6 +31,11 @@ apply_uci_config() {
 }
 
 start() {
+       config_load system
+       config_foreach system_config system
+}
+
+boot() {
        [ -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
@@ -66,10 +50,10 @@ start() {
        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
+       grep -q debugfs /proc/filesystems && mount -o noatime -t debugfs debugfs /sys/kernel/debug
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
-       load_modules /etc/modules.d/*
+       /sbin/kmodloader
 
        # allow wifi modules time to settle
        sleep 1
@@ -81,14 +65,11 @@ start() {
        rm -f /tmp/wireless.tmp
 
        apply_uci_config
-       config_load system
-       config_foreach system_config system
+       
+       # temporary hack until configd exists
+       /sbin/reload_config
 
-       killall -q hotplug2
-       [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
-                       --set-rules-file /etc/hotplug2.rules \
-                       --set-coldplug-cmd /sbin/udevtrigger \
-                       --max-children 1 >/dev/null 2>&1 &
+       start
 
        # create /dev/root if it doesn't exist
        [ -e /dev/root -o -h /dev/root ] || {
@@ -96,8 +77,3 @@ start() {
                [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
        }
 }
-
-stop() {
-       service_stop /sbin/klogd
-       service_stop /sbin/syslogd
-}