Revert r12510. Remove -rpath-link form TARGET_LDFLAGS as it breaks some

[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 c7038f5..49562b7 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -17,13 +17,9 @@ system_config() {
        [ -z "$timezone" ] && timezone=UTC
        echo "$timezone" > /tmp/TZ
 
        [ -z "$timezone" ] && timezone=UTC
        echo "$timezone" > /tmp/TZ
 

-       config_get log_ip "$cfg" log_ip
+       config_get log_ip "$cfg" log_ip 

        config_get log_size "$cfg" log_size
        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}
+       syslogd -C${log_size:-16} ${log_ip:+-L -R $log_ip}

        klogd
 }
 
        klogd
 }
 


@@ -37,22 +33,23 @@ start() {
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
        [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
 
        [ -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/state
        mkdir -p /tmp/.uci
        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
        chown 0700 /tmp/.uci
        touch /var/log/wtmp
        touch /var/log/lastlog

+       touch /tmp/resolv.conf.auto

        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 

+       killall -q hotplug2

        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
                        --max-children 1 --no-coldplug &
 
        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
                        --max-children 1 --no-coldplug &