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

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

Browse Source
This commit is contained in:
Calin Crisan 2020-01-14 23:45:19 +02:00
commit c92ae0d3f9
3 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/common/busybox.config
View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Busybox version: 1.29.3 # Busybox version: 1.29.3
# Wed Dec 18 22:45:43 2019 # Tue Jan 14 23:44:35 2020
# #
CONFIG_HAVE_DOT_CONFIG=y CONFIG_HAVE_DOT_CONFIG=y
@ -659,7 +659,7 @@ CONFIG_NSENTER=y
# CONFIG_RDEV is not set # CONFIG_RDEV is not set
# CONFIG_READPROFILE is not set # CONFIG_READPROFILE is not set
CONFIG_RENICE=y CONFIG_RENICE=y
# CONFIG_REV is not set CONFIG_REV=y
# CONFIG_RTCWAKE is not set # CONFIG_RTCWAKE is not set
# CONFIG_SCRIPT is not set # CONFIG_SCRIPT is not set
# CONFIG_SCRIPTREPLAY is not set # CONFIG_SCRIPTREPLAY is not set

11
board/common/overlay/etc/init.d/S14postupgrade
View File

@ -3,6 +3,7 @@
SYS_VERSION_FILE="/etc/version" SYS_VERSION_FILE="/etc/version"
VERSION_FILE="/data/etc/version" VERSION_FILE="/data/etc/version"
POST_UPGRADE_DIR="/usr/share/post-upgrade" POST_UPGRADE_DIR="/usr/share/post-upgrade"
POST_UPGRADE_NET_SCHEDULED="/data/.post-upgrade-net-scheduled"
LOG="/var/log/post-upgrade.log" LOG="/var/log/post-upgrade.log"
@ -33,11 +34,18 @@ function run_post_upgrade() {
echo "---- post-upgrade from ${version} to ${sys_version} ----" >> ${LOG} echo "---- post-upgrade from ${version} to ${sys_version} ----" >> ${LOG}
versions=$(ls -1 ${POST_UPGRADE_DIR} | cut -d '.' -f 1) echo -n > ${POST_UPGRADE_NET_SCHEDULED}
versions=$(ls -1 ${POST_UPGRADE_DIR} | rev | cut -d '.' -f 2-100 | rev)
for v in ${versions}; do for v in ${versions}; do
if [[ ${v} == "post-upgrade" ]]; then if [[ ${v} == "post-upgrade" ]]; then
continue continue
fi fi
if [[ ${v} == *-net ]]; then # scripts that require network
echo "${POST_UPGRADE_DIR}/${v}.sh" >> ${POST_UPGRADE_NET_SCHEDULED}
continue
fi
if [[ -z "${version}" ]] || version_gt ${v} ${version}; then if [[ -z "${version}" ]] || version_gt ${v} ${version}; then
msg_begin "Post-upgrading to version ${v}" msg_begin "Post-upgrading to version ${v}"
@ -69,4 +77,3 @@ case "$1" in
esac esac
exit $? exit $?

36
board/common/overlay/etc/init.d/S42postupgradenet Executable file
View File

@ -0,0 +1,36 @@
#!/bin/bash
POST_UPGRADE_NET_SCHEDULED="/data/.post-upgrade-net-scheduled"
LOG="/var/log/post-upgrade.log"
test -n "${OS_VERSION}" || source /etc/init.d/base
test -s ${POST_UPGRADE_NET_SCHEDULED} || exit 0
function run_post_upgrade() {
for script in $(cat ${POST_UPGRADE_NET_SCHEDULED}); do
msg_begin "Running post-upgrade script ${script}"
${script} >> ${LOG} 2>&1
test $? == 0 && msg_done || msg_fail
done
}
case "$1" in
start)
run_post_upgrade
rm ${POST_UPGRADE_NET_SCHEDULED}
;;
stop)
true
;;
*)
echo "Usage: $0 {start}"
exit 1
esac
exit $?