[package] base-files: Use -h instead of deprecated -L for symlink check

[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 3da0d6b..c3019df 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -2,6 +2,7 @@
 # Copyright (C) 2006 OpenWrt.org
 
 START=10
 # Copyright (C) 2006 OpenWrt.org
 
 START=10

+STOP=98

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


@@ -35,10 +36,9 @@ system_config() {
        [ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}
 }
 
        [ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}
 }
 

-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
 
 start() {
        [ -f /proc/mounts ] || /sbin/mount_root


@@ -59,6 +59,7 @@ 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
 
        killall -q hotplug2
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
        killall -q hotplug2


@@ -73,10 +74,15 @@ 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
        }
 
        load_modules /etc/modules.d/*
 }
                rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
                [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
        }
 
        load_modules /etc/modules.d/*
 }

+
+stop() {
+        killall -9 syslogd 2> /dev/null
+}
+