init: include /etc/init.d/conf from base

This commit is contained in:
Calin Crisan 2018-09-16 23:13:08 +03:00
parent 2d9cc9000b
commit 1484de1aba
9 changed files with 9 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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
}