jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Init scripts: fix sourcing order

Browse Source
This commit is contained in:
Calin Crisan 2019-01-11 14:09:33 +02:00
parent ef11ee161a
commit 6ac44f70cf
8 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/common/overlay/etc/init.d/S02modules
View File

@ -4,6 +4,7 @@ sys_modules_file="/etc/modules"
boot_modules_file="/boot/modules" boot_modules_file="/boot/modules"
modules_file="/data/etc/modules" modules_file="/data/etc/modules"
test -n "$os_version" || source /etc/init.d/base test -n "$os_version" || source /etc/init.d/base
case "$1" in case "$1" in

1
board/common/overlay/etc/init.d/S03hostname
View File

@ -4,6 +4,7 @@ sys_hostname_file="/etc/hostname"
boot_hostname_file="/boot/hostname" boot_hostname_file="/boot/hostname"
hostname_file="/data/etc/hostname" hostname_file="/data/etc/hostname"
test -n "$os_version" || source /etc/init.d/base test -n "$os_version" || source /etc/init.d/base
case "$1" in case "$1" in

6
board/common/overlay/etc/init.d/S33hostapd
View File

@ -12,12 +12,14 @@ watch_conf="/data/etc/watch.conf"
link_watch=yes link_watch=yes
link_watch_timeout=20 link_watch_timeout=20
test -f $watch_conf && source $watch_conf
test -n "$os_version" || source /etc/init.d/base
prepare_conf $conf $sys_conf $boot_conf prepare_conf $conf $sys_conf $boot_conf
test -f $conf || exit 0 test -f $conf || exit 0
test -n "$os_version" || source /etc/init.d/base test -f $watch_conf && source $watch_conf
running() { running() {
killall -0 hostapd &> /dev/null killall -0 hostapd &> /dev/null

5
board/common/overlay/etc/init.d/S35wifi
View File

@ -12,6 +12,9 @@ sys_watch_conf="/etc/watch.conf"
boot_watch_conf="/boot/watch.conf" boot_watch_conf="/boot/watch.conf"
watch_conf="/data/etc/watch.conf" watch_conf="/data/etc/watch.conf"
test -n "$os_version" || source /etc/init.d/base
prepare_conf $watch_conf $sys_watch_conf $boot_watch_conf prepare_conf $watch_conf $sys_watch_conf $boot_watch_conf
source $watch_conf source $watch_conf
@ -21,10 +24,10 @@ test -f $conf || exit 0
ssid=$(cat $conf | grep ssid | grep -v scan_ssid | cut -d '"' -f 2) 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 "$os_networkless" == "true" && exit 0 test "$os_networkless" == "true" && exit 0
connected() { connected() {
ip link show dev $os_wlan 2>&1 | grep LOWER_UP &> /dev/null && return 0 || return 1 ip link show dev $os_wlan 2>&1 | grep LOWER_UP &> /dev/null && return 0 || return 1
} }

6
board/common/overlay/etc/init.d/S36ppp
View File

@ -9,17 +9,19 @@ provider="mobile"
watch_conf="/data/etc/watch.conf" watch_conf="/data/etc/watch.conf"
source $watch_conf
test -n "$os_version" || source /etc/init.d/base
prepare_conf $conf $sys_conf $boot_conf prepare_conf $conf $sys_conf $boot_conf
test -e $conf/modem || exit 0 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 source $watch_conf
test "$os_networkless" == "true" && exit 0 test "$os_networkless" == "true" && exit 0
connected() { connected() {
ifconfig | grep $os_ppp &>/dev/null && return 0 || return 1 ifconfig | grep $os_ppp &>/dev/null && return 0 || return 1
} }

3
board/common/overlay/etc/init.d/S37bluetooth
View File

@ -4,6 +4,8 @@ sys_conf="/etc/bluetooth.conf"
boot_conf="/boot/bluetooth.conf" boot_conf="/boot/bluetooth.conf"
conf="/data/etc/bluetooth.conf" conf="/data/etc/bluetooth.conf"
test -n "$os_version" || source /etc/init.d/base
prepare_conf $conf $sys_conf $boot_conf prepare_conf $conf $sys_conf $boot_conf
test -f $conf || exit 0 test -f $conf || exit 0
@ -15,7 +17,6 @@ run_conf=/var/lib/bluetooth.conf
test -x $bluetoothd || exit 0 test -x $bluetoothd || exit 0
test -n "$os_version" || source /etc/init.d/base
configure() { configure() {
mkdir -p $run_data_dir mkdir -p $run_data_dir

13
board/common/overlay/etc/init.d/S45dnsmasq
View File

@ -7,18 +7,13 @@ conf="/data/etc/dnsmasq.conf"
log="/var/log/dnsmasq.log" log="/var/log/dnsmasq.log"
prog="/usr/sbin/dnsmasq" prog="/usr/sbin/dnsmasq"
if ! [[ -f $conf ]]; then
if [[ -f $boot_conf ]]; then
cp $boot_conf $conf
elif [[ -f $sys_conf ]]; then
cp $sys_conf $conf
fi
fi
test -f $conf || exit 0
test -n "$os_version" || source /etc/init.d/base test -n "$os_version" || source /etc/init.d/base
prepare_conf $conf $sys_conf $boot_conf
test -f $conf || exit 0
start() { start() {
msg_begin "Starting dnsmasq" msg_begin "Starting dnsmasq"

22
board/common/overlay/etc/init.d/S50date
View File

@ -11,26 +11,14 @@ sys_ntp_conf="/etc/ntp.conf"
boot_ntp_conf="/boot/ntp.conf" boot_ntp_conf="/boot/ntp.conf"
ntp_conf="/data/etc/ntp.conf" ntp_conf="/data/etc/ntp.conf"
if ! [[ -f $conf ]]; then
if [[ -f $boot_conf ]]; then
cp $boot_conf $conf
elif [[ -f $sys_conf ]]; then
cp $sys_conf $conf
fi
fi
if ! [[ -f $ntp_conf ]]; then
if [[ -f $boot_ntp_conf ]]; then
cp $boot_ntp_conf $ntp_conf
elif [[ -f $sys_ntp_conf ]]; then
cp $sys_ntp_conf $ntp_conf
fi
fi
test -f $conf || exit 0
test -n "$os_version" || source /etc/init.d/base test -n "$os_version" || source /etc/init.d/base
prepare_conf $conf $sys_conf $boot_conf
prepare_conf $ntp_conf $sys_ntp_conf $boot_ntp_conf
test -f $conf || exit 0
test "$os_networkless" == "true" && exit 0 test "$os_networkless" == "true" && exit 0
date_timeout=10 date_timeout=10