diff --git a/board/common/overlay/etc/init.d/S01mountall b/board/common/overlay/etc/init.d/S01mountall index bfde44d17b..829b974c64 100755 --- a/board/common/overlay/etc/init.d/S01mountall +++ b/board/common/overlay/etc/init.d/S01mountall @@ -29,6 +29,8 @@ mk_tty_login() { case "$1" in start) mount_fs + + # we need to source conf again, now that /data is available test -n "$os_debug" || source /etc/init.d/conf test "$os_debug" == "true" && remount_rw mk_tty_login diff --git a/board/common/overlay/etc/init.d/S35wifi b/board/common/overlay/etc/init.d/S35wifi index 357ee80b56..828fc71d49 100755 --- a/board/common/overlay/etc/init.d/S35wifi +++ b/board/common/overlay/etc/init.d/S35wifi @@ -39,7 +39,6 @@ ssid=$(cat $conf | grep ssid | grep -v scan_ssid | cut -d '"' -f 2) test -n "$ssid" || exit 0 test -n "$os_version" || source /etc/init.d/base -test -n "$os_debug" || source /etc/init.d/conf test "$os_networkless" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S36ppp b/board/common/overlay/etc/init.d/S36ppp index 01919e2281..7de9ee41ad 100755 --- a/board/common/overlay/etc/init.d/S36ppp +++ b/board/common/overlay/etc/init.d/S36ppp @@ -23,7 +23,6 @@ test -e $conf/modem || exit 0 test -e $conf/apn || exit 0 test -n "$os_version" || source /etc/init.d/base -test -n "$os_debug" || source /etc/init.d/conf test "$os_networkless" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S40network b/board/common/overlay/etc/init.d/S40network index a744bd1f9a..04328cfb5d 100755 --- a/board/common/overlay/etc/init.d/S40network +++ b/board/common/overlay/etc/init.d/S40network @@ -22,7 +22,6 @@ fi test -r $static_conf && source $static_conf test -n "$os_version" || source /etc/init.d/base -test -n "$os_debug" || source /etc/init.d/conf watch_eth() { count=0 diff --git a/board/common/overlay/etc/init.d/S41netwatch b/board/common/overlay/etc/init.d/S41netwatch index c7421d72f8..2ec59f483a 100755 --- a/board/common/overlay/etc/init.d/S41netwatch +++ b/board/common/overlay/etc/init.d/S41netwatch @@ -12,7 +12,6 @@ if [ -z "$netwatch_host" ] || [ -z "$netwatch_port" ]; then fi test -n "$os_version" || source /etc/init.d/base -test -n "$os_debug" || source /etc/init.d/conf test "$os_networkless" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index 695d694bb8..87464d368c 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -30,7 +30,6 @@ fi test -f $conf || exit 0 test -n "$os_version" || source /etc/init.d/base -test -n "$os_debug" || source /etc/init.d/conf test "$os_networkless" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S60sshd b/board/common/overlay/etc/init.d/S60sshd index 37546b1161..2dcd04ac7b 100755 --- a/board/common/overlay/etc/init.d/S60sshd +++ b/board/common/overlay/etc/init.d/S60sshd @@ -5,7 +5,6 @@ conf="/etc/sshd_config" test -f $conf || exit 0 test -n "$os_version" || source /etc/init.d/base -test -n "$os_debug" || source /etc/init.d/conf test "$os_networkless" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S99showinfo b/board/common/overlay/etc/init.d/S99showinfo index 1e0b7390d1..fac00a387d 100755 --- a/board/common/overlay/etc/init.d/S99showinfo +++ b/board/common/overlay/etc/init.d/S99showinfo @@ -1,7 +1,6 @@ #!/bin/bash test -n "$os_version" || source /etc/init.d/base -test -n "$os_debug" || source /etc/init.d/conf msg_info() { echo " # $1" diff --git a/board/common/overlay/etc/init.d/base b/board/common/overlay/etc/init.d/base index 11a5ef95eb..ef900a8955 100755 --- a/board/common/overlay/etc/init.d/base +++ b/board/common/overlay/etc/init.d/base @@ -4,6 +4,8 @@ source /etc/version board_sn=$(/etc/init.d/boardsn) board_name=$(cat /etc/board) +test -n "$os_debug" || source /etc/init.d/conf + msg_begin() { echo -n " * $1: " } @@ -20,3 +22,8 @@ msg_background() { test -n "$1" && echo $1 || echo "pending" } +panic_action() { + logger -t panic -s "rebooting" + /sbin/reboot +} +