mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 22:26:31 +00:00
init: include /etc/init.d/conf from base
This commit is contained in:
parent
2d9cc9000b
commit
1484de1aba
@ -29,6 +29,8 @@ mk_tty_login() {
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
mount_fs
|
mount_fs
|
||||||
|
|
||||||
|
# we need to source conf again, now that /data is available
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
test -n "$os_debug" || source /etc/init.d/conf
|
||||||
test "$os_debug" == "true" && remount_rw
|
test "$os_debug" == "true" && remount_rw
|
||||||
mk_tty_login
|
mk_tty_login
|
||||||
|
@ -39,7 +39,6 @@ ssid=$(cat $conf | grep ssid | grep -v scan_ssid | cut -d '"' -f 2)
|
|||||||
test -n "$ssid" || exit 0
|
test -n "$ssid" || exit 0
|
||||||
|
|
||||||
test -n "$os_version" || source /etc/init.d/base
|
test -n "$os_version" || source /etc/init.d/base
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
|
||||||
|
|
||||||
test "$os_networkless" == "true" && exit 0
|
test "$os_networkless" == "true" && exit 0
|
||||||
|
|
||||||
|
@ -23,7 +23,6 @@ test -e $conf/modem || exit 0
|
|||||||
test -e $conf/apn || exit 0
|
test -e $conf/apn || exit 0
|
||||||
|
|
||||||
test -n "$os_version" || source /etc/init.d/base
|
test -n "$os_version" || source /etc/init.d/base
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
|
||||||
|
|
||||||
test "$os_networkless" == "true" && exit 0
|
test "$os_networkless" == "true" && exit 0
|
||||||
|
|
||||||
|
@ -22,7 +22,6 @@ fi
|
|||||||
test -r $static_conf && source $static_conf
|
test -r $static_conf && source $static_conf
|
||||||
|
|
||||||
test -n "$os_version" || source /etc/init.d/base
|
test -n "$os_version" || source /etc/init.d/base
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
|
||||||
|
|
||||||
watch_eth() {
|
watch_eth() {
|
||||||
count=0
|
count=0
|
||||||
|
@ -12,7 +12,6 @@ if [ -z "$netwatch_host" ] || [ -z "$netwatch_port" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
test -n "$os_version" || source /etc/init.d/base
|
test -n "$os_version" || source /etc/init.d/base
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
|
||||||
|
|
||||||
test "$os_networkless" == "true" && exit 0
|
test "$os_networkless" == "true" && exit 0
|
||||||
|
|
||||||
|
@ -30,7 +30,6 @@ fi
|
|||||||
test -f $conf || exit 0
|
test -f $conf || exit 0
|
||||||
|
|
||||||
test -n "$os_version" || source /etc/init.d/base
|
test -n "$os_version" || source /etc/init.d/base
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
|
||||||
|
|
||||||
test "$os_networkless" == "true" && exit 0
|
test "$os_networkless" == "true" && exit 0
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@ conf="/etc/sshd_config"
|
|||||||
test -f $conf || exit 0
|
test -f $conf || exit 0
|
||||||
|
|
||||||
test -n "$os_version" || source /etc/init.d/base
|
test -n "$os_version" || source /etc/init.d/base
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
|
||||||
|
|
||||||
test "$os_networkless" == "true" && exit 0
|
test "$os_networkless" == "true" && exit 0
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
test -n "$os_version" || source /etc/init.d/base
|
test -n "$os_version" || source /etc/init.d/base
|
||||||
test -n "$os_debug" || source /etc/init.d/conf
|
|
||||||
|
|
||||||
msg_info() {
|
msg_info() {
|
||||||
echo " # $1"
|
echo " # $1"
|
||||||
|
@ -4,6 +4,8 @@ source /etc/version
|
|||||||
board_sn=$(/etc/init.d/boardsn)
|
board_sn=$(/etc/init.d/boardsn)
|
||||||
board_name=$(cat /etc/board)
|
board_name=$(cat /etc/board)
|
||||||
|
|
||||||
|
test -n "$os_debug" || source /etc/init.d/conf
|
||||||
|
|
||||||
msg_begin() {
|
msg_begin() {
|
||||||
echo -n " * $1: "
|
echo -n " * $1: "
|
||||||
}
|
}
|
||||||
@ -20,3 +22,8 @@ msg_background() {
|
|||||||
test -n "$1" && echo $1 || echo "pending"
|
test -n "$1" && echo $1 || echo "pending"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
panic_action() {
|
||||||
|
logger -t panic -s "rebooting"
|
||||||
|
/sbin/reboot
|
||||||
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user