Merge remote-tracking branch 'thingos/dev' into dev

This commit is contained in:
Calin Crisan 2019-12-20 23:39:51 +02:00
commit 7d76c8e029
2 changed files with 3 additions and 4 deletions

View File

@ -5,7 +5,8 @@ PID_FILE=/tmp/rc.pid
source /etc/init.d/base
echo "---- shutting down ${OS_NAME} ${OS_VERSION} ----" >> ${BOOT_LOG}
echo
echo "---- shutting down ${OS_NAME} ${OS_VERSION} ----" | tee -a ${BOOT_LOG}
# stop all init scripts in /etc/init.d,
# executing them in reverse numerical order.
@ -19,4 +20,3 @@ pid=$(cat ${PID_FILE})
while kill -0 ${pid} 2>/dev/null; do
sleep 1
done

View File

@ -12,7 +12,7 @@ set +a
source /etc/init.d/base
echo "---- booting ${OS_NAME} ${OS_VERSION} ----" >> ${TMP_BOOT_LOG}
echo "---- booting ${OS_NAME} ${OS_VERSION} ----" | tee -a ${TMP_BOOT_LOG}
# start all init scripts in /etc/init.d,
# executing them in numerical order.
@ -28,4 +28,3 @@ while kill -0 ${pid} 2>/dev/null; do
done
test -d $(dirname ${BOOT_LOG}) && cat ${TMP_BOOT_LOG} >> ${BOOT_LOG}