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/feature-boot-conf' into thingos-next

Browse Source
This commit is contained in:
Calin Crisan 2019-01-13 22:52:13 +02:00
commit eb872a9234
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
board/common/overlay/etc/init.d/os_conf
View File

@ -1,21 +1,21 @@
SYS_CONF="/etc/os.conf" _SYS_CONF="/etc/os.conf"
BOOT_CONF="/boot/os.conf" _BOOT_CONF="/boot/os.conf"
DATA_CONF="/data/etc/os.conf" _DATA_CONF="/data/etc/os.conf"
# source in all conf files in order of precedence # source in all conf files in order of precedence
if [[ -f ${SYS_CONF} ]]; then if [[ -f ${_SYS_CONF} ]]; then
source ${SYS_CONF} source ${_SYS_CONF}
fi fi
if [[ -f ${DATA_CONF} ]]; then if [[ -f ${_DATA_CONF} ]]; then
source ${DATA_CONF} source ${_DATA_CONF}
fi fi
if [[ -f ${BOOT_CONF} ]]; then if [[ -f ${_BOOT_CONF} ]]; then
source ${BOOT_CONF} source ${_BOOT_CONF}
fi fi
unset SYS_CONF BOOT_CONF DATA_CONF unset _SYS_CONF _BOOT_CONF _DATA_CONF

4
build.sh
View File

@ -26,14 +26,14 @@ test -f $basedir/.build-env && source $basedir/.build-env
if [ -n "$THINGOS_SHORT_NAME" ]; then if [ -n "$THINGOS_SHORT_NAME" ]; then
osname=$THINGOS_SHORT_NAME osname=$THINGOS_SHORT_NAME
else else
osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name) osname=$(source $basedir/board/common/overlay/etc/version && echo $OS_SHORT_NAME)
fi fi
# OS version # OS version
if [ -n "$THINGOS_VERSION" ]; then if [ -n "$THINGOS_VERSION" ]; then
osversion=$THINGOS_VERSION osversion=$THINGOS_VERSION
else else
osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version) osversion=$(source $basedir/board/common/overlay/etc/version && echo $OS_VERSION)
fi fi
# when the special "boards" keyword is used for board, simply list all known boards # when the special "boards" keyword is used for board, simply list all known boards