diff --git a/board/common/overlay/etc/init.d/S02restorebackups b/board/common/overlay/etc/init.d/S02restorebackups index fd5e733a4b..7e5c4daa6c 100755 --- a/board/common/overlay/etc/init.d/S02restorebackups +++ b/board/common/overlay/etc/init.d/S02restorebackups @@ -28,7 +28,7 @@ case "$1" in done # source os_conf again, as it might have changed after restore - test -f /etc/init.d/os_conf && source /etc/init.d/os_conf + test -s /etc/init.d/os_conf && source /etc/init.d/os_conf if [[ "${OS_DEBUG}" != "true" ]]; then mount -o remount,ro /boot fi diff --git a/board/common/overlay/etc/init.d/S10sysctl b/board/common/overlay/etc/init.d/S10sysctl index 09d68e0360..96e0641f27 100755 --- a/board/common/overlay/etc/init.d/S10sysctl +++ b/board/common/overlay/etc/init.d/S10sysctl @@ -17,9 +17,9 @@ fi case "$1" in start) msg_begin "Applying sysctl parameters" - test -f ${SYS_CONF} && sysctl -q -p ${SYS_CONF} - test -f ${CONF} && sysctl -q -p ${CONF} - test -f ${BOOT_CONF} && sysctl -q -p ${BOOT_CONF} + test -s ${SYS_CONF} && sysctl -q -p ${SYS_CONF} + test -s ${CONF} && sysctl -q -p ${CONF} + test -s ${BOOT_CONF} && sysctl -q -p ${BOOT_CONF} msg_done ;; diff --git a/board/common/overlay/etc/init.d/S12udev b/board/common/overlay/etc/init.d/S12udev index 1c69355fd5..d0eca9fbdf 100755 --- a/board/common/overlay/etc/init.d/S12udev +++ b/board/common/overlay/etc/init.d/S12udev @@ -6,7 +6,7 @@ PROG_UA="/sbin/udevadm" test -f ${PROG} || exit 0 -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base diff --git a/board/common/overlay/etc/init.d/S30dbus b/board/common/overlay/etc/init.d/S30dbus index c239b80654..0783cdbeb0 100755 --- a/board/common/overlay/etc/init.d/S30dbus +++ b/board/common/overlay/etc/init.d/S30dbus @@ -12,7 +12,7 @@ PROG_UA="/usr/bin/udevadm" test -x ${PROG} || exit 0 # dbus is currently only used by bluez -test -f ${BTCONF} || test -f ${BOOT_BTCONF} || test -f ${SYS_BTCONF} || exit 0 +test -s ${BTCONF} || test -s ${BOOT_BTCONF} || test -s ${SYS_BTCONF} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base diff --git a/board/common/overlay/etc/init.d/S33hostapd b/board/common/overlay/etc/init.d/S33hostapd index 01bec9ee05..dad69d736a 100755 --- a/board/common/overlay/etc/init.d/S33hostapd +++ b/board/common/overlay/etc/init.d/S33hostapd @@ -18,9 +18,9 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base prepare_conf ${CONF} ${SYS_CONF} ${BOOT_CONF} -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 -test -f ${WATCH_CONF} && source ${WATCH_CONF} +test -s ${WATCH_CONF} && source ${WATCH_CONF} running() { diff --git a/board/common/overlay/etc/init.d/S35wifi b/board/common/overlay/etc/init.d/S35wifi index b154042892..c40d05ee8b 100755 --- a/board/common/overlay/etc/init.d/S35wifi +++ b/board/common/overlay/etc/init.d/S35wifi @@ -21,7 +21,7 @@ prepare_conf ${WATCH_CONF} ${SYS_WATCH_CONF} ${BOOT_WATCH_CONF} source ${WATCH_CONF} prepare_conf ${CONF} ${SYS_CONF} ${BOOT_CONF} -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 ssid=$(cat ${CONF} | grep ssid | grep -v scan_ssid | cut -d '"' -f 2) test -n "${ssid}" || exit 0 diff --git a/board/common/overlay/etc/init.d/S37bluetooth b/board/common/overlay/etc/init.d/S37bluetooth index fce2fd6292..3d82b6dfc0 100755 --- a/board/common/overlay/etc/init.d/S37bluetooth +++ b/board/common/overlay/etc/init.d/S37bluetooth @@ -17,7 +17,7 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base prepare_conf ${CONF} ${SYS_CONF} ${BOOT_CONF} -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 configure() { @@ -26,7 +26,7 @@ configure() { cp ${CONF} ${RUN_CONF} # if no specific name configured, use hostname - if ! grep -E 'Name\s*=' ${RUN_CONF} &>/dev/null; then + if ! grep -E 'Name\s*=' ${RUN_CONF} &>/dev/null; then sed -ri "s/(\[General\])/\1\nName = $(hostname)/" ${RUN_CONF} fi diff --git a/board/common/overlay/etc/init.d/S41netwatch b/board/common/overlay/etc/init.d/S41netwatch index 787ea39b5b..23bac120e3 100755 --- a/board/common/overlay/etc/init.d/S41netwatch +++ b/board/common/overlay/etc/init.d/S41netwatch @@ -8,7 +8,7 @@ NETWATCH_INTERVAL=20 # watch configuration is already prepared by wifi init script -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 source ${CONF} test -n "${NETWATCH_HOST}" || exit 0 diff --git a/board/common/overlay/etc/init.d/S43firewall b/board/common/overlay/etc/init.d/S43firewall index bab1a54053..1db1b45dc2 100755 --- a/board/common/overlay/etc/init.d/S43firewall +++ b/board/common/overlay/etc/init.d/S43firewall @@ -8,7 +8,7 @@ CONF="/data/etc/firewall.sh" test -n "${OS_VERSION}" || source /etc/init.d/base prepare_conf ${CONF} ${SYS_CONF} ${BOOT_CONF} -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 start() { diff --git a/board/common/overlay/etc/init.d/S45dnsmasq b/board/common/overlay/etc/init.d/S45dnsmasq index f178f84a3f..d7d7f509f8 100755 --- a/board/common/overlay/etc/init.d/S45dnsmasq +++ b/board/common/overlay/etc/init.d/S45dnsmasq @@ -13,7 +13,7 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base prepare_conf ${CONF} ${SYS_CONF} ${BOOT_CONF} -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 start() { diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index 930eefe382..b8de6a29c3 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -18,7 +18,7 @@ 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 -s ${CONF} || exit 0 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 0c68a5446a..772b98b27c 100755 --- a/board/common/overlay/etc/init.d/S60sshd +++ b/board/common/overlay/etc/init.d/S60sshd @@ -10,7 +10,7 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 test "${OS_NETWORKLESS}" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S61proftpd b/board/common/overlay/etc/init.d/S61proftpd index 9835df2fc3..f0a16817aa 100755 --- a/board/common/overlay/etc/init.d/S61proftpd +++ b/board/common/overlay/etc/init.d/S61proftpd @@ -9,7 +9,7 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base test -n "${OS_DEBUG}" || source /etc/init.d/conf -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 test "${OS_NETWORKLESS}" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S62smb b/board/common/overlay/etc/init.d/S62smb index e203b5556c..74637cf5a2 100755 --- a/board/common/overlay/etc/init.d/S62smb +++ b/board/common/overlay/etc/init.d/S62smb @@ -11,7 +11,7 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base test -n "${OS_DEBUG}" || source /etc/init.d/conf -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 test "${OS_NETWORKLESS}" == "true" && exit 0 diff --git a/board/common/overlay/etc/init.d/S70mongod b/board/common/overlay/etc/init.d/S70mongod index 0b9fbaea90..b4e44106ec 100755 --- a/board/common/overlay/etc/init.d/S70mongod +++ b/board/common/overlay/etc/init.d/S70mongod @@ -12,7 +12,7 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base prepare_conf ${CONF} ${SYS_CONF} ${BOOT_CONF} -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 start() { diff --git a/board/common/overlay/etc/init.d/S71redis b/board/common/overlay/etc/init.d/S71redis index 6ba7a1d0a6..9a80e27c0a 100755 --- a/board/common/overlay/etc/init.d/S71redis +++ b/board/common/overlay/etc/init.d/S71redis @@ -12,7 +12,7 @@ test -x ${PROG} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base prepare_conf ${CONF} ${SYS_CONF} ${BOOT_CONF} -test -f ${CONF} || exit 0 +test -s ${CONF} || exit 0 start() { diff --git a/board/common/overlay/etc/init.d/S98userinit b/board/common/overlay/etc/init.d/S98userinit index 835229e78e..39f316d8c5 100755 --- a/board/common/overlay/etc/init.d/S98userinit +++ b/board/common/overlay/etc/init.d/S98userinit @@ -3,7 +3,7 @@ USERINIT="/data/etc/userinit.sh" -test -f ${USERINIT} || exit 0 +test -s ${USERINIT} || exit 0 test -n "${OS_VERSION}" || source /etc/init.d/base diff --git a/board/common/overlay/etc/init.d/rcS b/board/common/overlay/etc/init.d/rcS index f8f6f2aa2b..5c3874f08d 100755 --- a/board/common/overlay/etc/init.d/rcS +++ b/board/common/overlay/etc/init.d/rcS @@ -5,9 +5,9 @@ TMP_BOOT_LOG=/tmp/_boot.log PID_FILE=/tmp/rc.pid set -a -test -f /etc/environment && source /etc/environment -test -f /data/etc/environment && source /data/etc/environment -test -f /boot/etc/environment && source /boot/etc/environment +test -s /etc/environment && source /etc/environment +test -s /data/etc/environment && source /data/etc/environment +test -s /boot/etc/environment && source /boot/etc/environment set +a source /etc/init.d/base