aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuji Mano <yuji.mano@am.sony.com>2008-06-16 19:14:13 +0000
committerYuji Mano <yuji.mano@am.sony.com>2008-06-16 19:14:13 +0000
commit5ee48c0b00bbb5225739c91a9f4912bb6fa38150 (patch)
tree14e27bb2af4a9b277ba0f884b493f056cb15b550
parentf17fc3d98d40a61f0ffc66a3dc2badf5c76971d4 (diff)
downloadupstream-5ee48c0b00bbb5225739c91a9f4912bb6fa38150.tar.gz
upstream-5ee48c0b00bbb5225739c91a9f4912bb6fa38150.tar.bz2
upstream-5ee48c0b00bbb5225739c91a9f4912bb6fa38150.zip
Add the PS3 specific utility bl-option, a helper sctipt to get and set bootloader options in flash memory.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> SVN-Revision: 11512
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot17
-rwxr-xr-xtarget/linux/ps3/base-files/bin/login14
2 files changed, 17 insertions, 14 deletions
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 57c034eb48..c7038f5f30 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -17,9 +17,13 @@ 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
- syslogd -C${log_size:-16} ${log_ip:+-L -R $log_ip}
+ 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}
klogd
}
@@ -33,15 +37,16 @@ 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 98fcbf0056..2e649f04fe 100755
--- a/target/linux/ps3/base-files/bin/login
+++ b/target/linux/ps3/base-files/bin/login
@@ -1,13 +1,11 @@
#!/bin/sh
# Copyright (C) 2008 OpenWrt.org
-ps3_db_bin=/usr/sbin/ps3-flash-util
-ps3_db_owner_petitboot=3
-ps3_db_key_telnet=3
+bl_option=/sbin/bl-option
-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
+if [ ! -f $bl_option ] ||
+ [ ! `$bl_option --get-telnet-enabled` ] ||
+ [ `$bl_option --get-telnet-enabled` = "0" ]; then
echo \
"
=== IMPORTANT ==========================
@@ -19,12 +17,12 @@ if [ ! -f $ps3_db_bin ] ||
You can enable telnet login with the
following command in the host console:
- # $ps3_db_bin -H $ps3_db_owner_petitboot $ps3_db_key_telnet 1
+ # $bl_option -T 1
You can disable telnet login with the
following command in the host console:
- # $ps3_db_bin -H $ps3_db_owner_petitboot $ps3_db_key_telnet 0
+ # $bl_option -T 0
----------------------------------------
"
exit 0