diff options
author | Luka Perkov <luka@openwrt.org> | 2013-12-09 11:30:14 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-12-09 11:30:14 +0000 |
commit | 3ceb6b3274d75fb5dc05b9eb42f2a98ee445f122 (patch) | |
tree | 30f8751c74750a210d9321522993e8fa17ffcd1c /package/base-files/files/lib/preinit | |
parent | 18dd10190370853c3efc10b33711313a3ecb9a09 (diff) | |
download | mtk-20170518-3ceb6b3274d75fb5dc05b9eb42f2a98ee445f122.zip mtk-20170518-3ceb6b3274d75fb5dc05b9eb42f2a98ee445f122.tar.gz mtk-20170518-3ceb6b3274d75fb5dc05b9eb42f2a98ee445f122.tar.bz2 |
base-files: fix whitespaces
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39006
Diffstat (limited to 'package/base-files/files/lib/preinit')
8 files changed, 118 insertions, 127 deletions
diff --git a/package/base-files/files/lib/preinit/10_indicate_failsafe b/package/base-files/files/lib/preinit/10_indicate_failsafe index 7761fd3..6afae41 100644 --- a/package/base-files/files/lib/preinit/10_indicate_failsafe +++ b/package/base-files/files/lib/preinit/10_indicate_failsafe @@ -5,14 +5,13 @@ # commands for emitting messages to network in failsafe mode indicate_failsafe_led () { - set_state failsafe + set_state failsafe } indicate_failsafe() { - echo "- failsafe -" - preinit_net_echo "Entering Failsafe!\n" - indicate_failsafe_led + echo "- failsafe -" + preinit_net_echo "Entering Failsafe!\n" + indicate_failsafe_led } boot_hook_add failsafe indicate_failsafe - diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit index da70b97..dc22f57 100644 --- a/package/base-files/files/lib/preinit/10_indicate_preinit +++ b/package/base-files/files/lib/preinit/10_indicate_preinit @@ -3,48 +3,47 @@ # Copyright (C) 2010 Vertical Communications preinit_ip() { - # if the preinit interface isn't specified and ifname is set in - # preinit.arch use that interface - if [ -z "$pi_ifname" ]; then - pi_ifname=$ifname - fi - - [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up - } + # if the preinit interface isn't specified and ifname is set in + # preinit.arch use that interface + if [ -z "$pi_ifname" ]; then + pi_ifname=$ifname + fi + + [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { + ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up + } } preinit_ip_deconfig() { - [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - ifconfig $pi_ifname 0.0.0.0 down - } + [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { + ifconfig $pi_ifname 0.0.0.0 down + } } preinit_net_echo() { [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - { + { [ "$pi_preinit_net_messages" = "y" ] || { - [ "$pi_failsafe_net_message" = "true" ] && - [ "$pi_preinit_no_failsafe_netmsg" != "y" ] - } + [ "$pi_failsafe_net_message" = "true" ] && + [ "$pi_preinit_no_failsafe_netmsg" != "y" ] + } } && netmsg $pi_broadcast "$1" - } + } } preinit_echo() { - preinit_net_echo $1 - echo $1 + preinit_net_echo $1 + echo $1 } pi_indicate_led() { - set_state preinit + set_state preinit } pi_indicate_preinit() { - preinit_net_echo "Doing OpenWRT Preinit\n" - pi_indicate_led + preinit_net_echo "Doing OpenWRT Preinit\n" + pi_indicate_led } boot_hook_add preinit_main preinit_ip boot_hook_add preinit_main pi_indicate_preinit - diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait index 5225659..3d69baf 100644 --- a/package/base-files/files/lib/preinit/30_failsafe_wait +++ b/package/base-files/files/lib/preinit/30_failsafe_wait @@ -3,95 +3,94 @@ # Copyright (C) 2010 Vertical Communications fs_wait_for_key () { - local timeout=$3 - local timer - local do_keypress - local keypress_true="$(mktemp)" - local keypress_wait="$(mktemp)" - local keypress_sec="$(mktemp)" - if [ -z "$keypress_wait" ]; then - keypress_wait=/tmp/.keypress_wait - touch $keypress_wait - fi - if [ -z "$keypress_true" ]; then - keypress_true=/tmp/.keypress_true - touch $keypress_true - fi - if [ -z "$keypress_sec" ]; then - keypress_sec=/tmp/.keypress_sec - touch $keypress_sec - fi + local timeout=$3 + local timer + local do_keypress + local keypress_true="$(mktemp)" + local keypress_wait="$(mktemp)" + local keypress_sec="$(mktemp)" + if [ -z "$keypress_wait" ]; then + keypress_wait=/tmp/.keypress_wait + touch $keypress_wait + fi + if [ -z "$keypress_true" ]; then + keypress_true=/tmp/.keypress_true + touch $keypress_true + fi + if [ -z "$keypress_sec" ]; then + keypress_sec=/tmp/.keypress_sec + touch $keypress_sec + fi - trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait" INT - trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait" USR1 + trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait" INT + trap "echo 'true' >$keypress_true; lock -u $keypress_wait ; rm -f $keypress_wait" USR1 - [ -n "$timeout" ] || timeout=1 - [ $timeout -ge 1 ] || timeout=1 - timer=$timeout - lock $keypress_wait - { - while [ $timer -gt 0 ]; do - echo "$timer" >$keypress_sec - timer=$(($timer - 1)) - sleep 1 - done - lock -u $keypress_wait - rm -f $keypress_wait - } & - - echo "Press the [$1] key and hit [enter] $2" - echo "Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level" - # if we're on the console we wait for input - { - while [ -r $keypress_wait ]; do - timer="$(cat $keypress_sec)" - - [ -n "$timer" ] || timer=1 - timer="${timer%%\ *}" - [ $timer -ge 1 ] || timer=1 - do_keypress="" - { - read -t "$timer" do_keypress - case "$do_keypress" in - $1) - echo "true" >$keypress_true - ;; - 1 | 2 | 3 | 4) - echo "$do_keypress" >/tmp/debug_level - ;; - *) - continue; - ;; - esac + [ -n "$timeout" ] || timeout=1 + [ $timeout -ge 1 ] || timeout=1 + timer=$timeout + lock $keypress_wait + { + while [ $timer -gt 0 ]; do + echo "$timer" >$keypress_sec + timer=$(($timer - 1)) + sleep 1 + done lock -u $keypress_wait rm -f $keypress_wait - } - done - } - lock -w $keypress_wait + } & + + echo "Press the [$1] key and hit [enter] $2" + echo "Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level" + # if we're on the console we wait for input + { + while [ -r $keypress_wait ]; do + timer="$(cat $keypress_sec)" + + [ -n "$timer" ] || timer=1 + timer="${timer%%\ *}" + [ $timer -ge 1 ] || timer=1 + do_keypress="" + { + read -t "$timer" do_keypress + case "$do_keypress" in + $1) + echo "true" >$keypress_true + ;; + 1 | 2 | 3 | 4) + echo "$do_keypress" >/tmp/debug_level + ;; + *) + continue; + ;; + esac + lock -u $keypress_wait + rm -f $keypress_wait + } + done + } + lock -w $keypress_wait - keypressed=1 - [ "$(cat $keypress_true)" = "true" ] && keypressed=0 - - rm -f $keypress_true - rm -f $keypress_wait - rm -f $keypress_sec - - return $keypressed + keypressed=1 + [ "$(cat $keypress_true)" = "true" ] && keypressed=0 + + rm -f $keypress_true + rm -f $keypress_wait + rm -f $keypress_sec + + return $keypressed } failsafe_wait() { - FAILSAFE= - grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE - if [ "$FAILSAFE" != "true" ]; then - pi_failsafe_net_message=true - preinit_net_echo "Please press button now to enter failsafe" - pi_failsafe_net_message=false - fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true - [ -f "/tmp/failsafe_button" ] && FAILSAFE=true && echo "- failsafe button "`cat /tmp/failsafe_button`" was pressed -" - [ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe - fi + FAILSAFE= + grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE + if [ "$FAILSAFE" != "true" ]; then + pi_failsafe_net_message=true + preinit_net_echo "Please press button now to enter failsafe" + pi_failsafe_net_message=false + fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true + [ -f "/tmp/failsafe_button" ] && FAILSAFE=true && echo "- failsafe button "`cat /tmp/failsafe_button`" was pressed -" + [ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe + fi } boot_hook_add preinit_main failsafe_wait - diff --git a/package/base-files/files/lib/preinit/40_run_failsafe_hook b/package/base-files/files/lib/preinit/40_run_failsafe_hook index faa043c..cb43ad3 100644 --- a/package/base-files/files/lib/preinit/40_run_failsafe_hook +++ b/package/base-files/files/lib/preinit/40_run_failsafe_hook @@ -10,4 +10,3 @@ run_failsafe_hook() { } boot_hook_add preinit_main run_failsafe_hook - diff --git a/package/base-files/files/lib/preinit/50_indicate_regular_preinit b/package/base-files/files/lib/preinit/50_indicate_regular_preinit index c200dad..bc223b3 100644 --- a/package/base-files/files/lib/preinit/50_indicate_regular_preinit +++ b/package/base-files/files/lib/preinit/50_indicate_regular_preinit @@ -3,9 +3,8 @@ # Copyright (C) 2010 Vertical Communications indicate_regular_preinit() { - preinit_net_echo "Continuing with Regular Preinit\n" - pi_indicate_led + preinit_net_echo "Continuing with Regular Preinit\n" + pi_indicate_led } boot_hook_add preinit_main indicate_regular_preinit - diff --git a/package/base-files/files/lib/preinit/70_initramfs_test b/package/base-files/files/lib/preinit/70_initramfs_test index 15c0dcd..8504e34 100644 --- a/package/base-files/files/lib/preinit/70_initramfs_test +++ b/package/base-files/files/lib/preinit/70_initramfs_test @@ -3,12 +3,11 @@ # Copyright (C) 2010 Vertical Communications initramfs_test() { - if [ -n "$INITRAMFS" ]; then - boot_run_hook initramfs - preinit_ip_deconfig - break - fi + if [ -n "$INITRAMFS" ]; then + boot_run_hook initramfs + preinit_ip_deconfig + break + fi } boot_hook_add preinit_main initramfs_test - diff --git a/package/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login index 05d6b77..15dcbd8 100644 --- a/package/base-files/files/lib/preinit/99_10_failsafe_login +++ b/package/base-files/files/lib/preinit/99_10_failsafe_login @@ -3,16 +3,14 @@ # Copyright (C) 2010 Vertical Communications failsafe_netlogin () { - telnetd -l /bin/login.sh <> /dev/null 2>&1 + telnetd -l /bin/login.sh <> /dev/null 2>&1 } failsafe_shell() { - lock /tmp/.failsafe - ash --login - echo "Please reboot system when done with failsafe network logins" + lock /tmp/.failsafe + ash --login + echo "Please reboot system when done with failsafe network logins" } - boot_hook_add failsafe failsafe_netlogin boot_hook_add failsafe failsafe_shell - diff --git a/package/base-files/files/lib/preinit/99_10_run_init b/package/base-files/files/lib/preinit/99_10_run_init index a8f330f..b4f0ec2 100644 --- a/package/base-files/files/lib/preinit/99_10_run_init +++ b/package/base-files/files/lib/preinit/99_10_run_init @@ -3,8 +3,7 @@ # Copyright (C) 2010 Vertical Communications run_init() { - preinit_ip_deconfig + preinit_ip_deconfig } boot_hook_add preinit_main run_init - |