Revert previous bad commit r11512

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11513 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index c7038f5..57c034e 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
 
-       config_get log_ip "$cfg" log_ip
+       config_get log_ip "$cfg" log_ip 
        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
 }
 
@@ -37,16 +33,15 @@ start() {
        [ -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
-
-       apply_uci_config
-       config_load system
-       config_foreach system_config system
-
        chown 0700 /tmp/.uci
        touch /var/log/wtmp
        touch /var/log/lastlog

diff --git a/target/linux/ps3/base-files/bin/login b/target/linux/ps3/base-files/bin/login
index 2e649f0..98fcbf0 100755 (executable)
--- a/target/linux/ps3/base-files/bin/login
+++ b/target/linux/ps3/base-files/bin/login
@@ -1,11 +1,13 @@
 #!/bin/sh
 # Copyright (C) 2008 OpenWrt.org
 
-bl_option=/sbin/bl-option
+ps3_db_bin=/usr/sbin/ps3-flash-util
+ps3_db_owner_petitboot=3
+ps3_db_key_telnet=3
 
-if [ ! -f $bl_option ] ||
-   [ ! `$bl_option --get-telnet-enabled` ] ||
-   [ `$bl_option --get-telnet-enabled` = "0" ]; then
+if [ ! -f $ps3_db_bin ] ||
+   [ ! `$ps3_db_bin -P $ps3_db_owner_petitboot $ps3_db_key_telnet` ] ||
+   [ `$ps3_db_bin -P $ps3_db_owner_petitboot $ps3_db_key_telnet` = 0 ]; then
     echo \
 "
  === IMPORTANT ==========================
@@ -17,12 +19,12 @@ if [ ! -f $bl_option ] ||
   You can enable telnet login with the
   following command in the host console:
 
-  # $bl_option -T 1
+  # $ps3_db_bin -H $ps3_db_owner_petitboot $ps3_db_key_telnet 1
 
   You can disable telnet login with the
   following command in the host console:
 
-  # $bl_option -T 0
+  # $ps3_db_bin -H $ps3_db_owner_petitboot $ps3_db_key_telnet 0
  ----------------------------------------
 "
     exit 0