mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-10-19 21:22:50 +03:00
always create go2rtc.yaml after removing it and don't let opt_in_out stop frigate
The go2rtc else-branch was only reachable when a regular file was planted between rm and the test, and then loaded that file as go2rtc's config. create_config.py now runs unconditionally and its exclusive create fails closed. opt_in_out runs after s6-svc -O, so a failure there was terminal under errexit.
This commit is contained in:
@@ -14,8 +14,7 @@ fi
|
|||||||
# Tell S6-Overlay not to restart this service
|
# Tell S6-Overlay not to restart this service
|
||||||
s6-svc -O .
|
s6-svc -O .
|
||||||
|
|
||||||
# This runs as root before any /config path enters the environment; -I skips
|
# Runs as root with root's HOME and LD_LIBRARY_PATH; -I skips user site-packages
|
||||||
# the user site-packages under $HOME
|
|
||||||
function set_libva_version() {
|
function set_libva_version() {
|
||||||
local ffmpeg_path
|
local ffmpeg_path
|
||||||
ffmpeg_path=$(python3 -I /usr/local/ffmpeg/get_ffmpeg_path.py)
|
ffmpeg_path=$(python3 -I /usr/local/ffmpeg/get_ffmpeg_path.py)
|
||||||
@@ -45,7 +44,7 @@ run_as+=(env
|
|||||||
|
|
||||||
# opt out of openvino telemetry; the marker lands under the service's HOME
|
# opt out of openvino telemetry; the marker lands under the service's HOME
|
||||||
if [ -e /usr/local/bin/opt_in_out ]; then
|
if [ -e /usr/local/bin/opt_in_out ]; then
|
||||||
"${run_as[@]}" /usr/local/bin/opt_in_out --opt_out > /dev/null 2>&1
|
"${run_as[@]}" /usr/local/bin/opt_in_out --opt_out > /dev/null 2>&1 || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "[INFO] Starting Frigate..."
|
echo "[INFO] Starting Frigate..."
|
||||||
|
|||||||
@@ -66,23 +66,18 @@ function set_libva_version() {
|
|||||||
|
|
||||||
set_libva_version
|
set_libva_version
|
||||||
|
|
||||||
if [[ -e "/dev/shm/go2rtc.yaml" || -L "/dev/shm/go2rtc.yaml" ]]; then
|
# create_config.py creates the file exclusively and fails if anything
|
||||||
echo "[INFO] Removing stale config from last run..."
|
# reappears at this path
|
||||||
rm /dev/shm/go2rtc.yaml
|
rm -f /dev/shm/go2rtc.yaml
|
||||||
|
|
||||||
|
echo "[INFO] Preparing new go2rtc config..."
|
||||||
|
|
||||||
|
if [[ -n "${SUPERVISOR_TOKEN:-}" ]]; then
|
||||||
|
# Running as a Home Assistant Add-on, infer the IP address and port
|
||||||
|
get_ip_and_port_from_supervisor
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -f "/dev/shm/go2rtc.yaml" ]]; then
|
python3 -I /usr/local/go2rtc/create_config.py
|
||||||
echo "[INFO] Preparing new go2rtc config..."
|
|
||||||
|
|
||||||
if [[ -n "${SUPERVISOR_TOKEN:-}" ]]; then
|
|
||||||
# Running as a Home Assistant Add-on, infer the IP address and port
|
|
||||||
get_ip_and_port_from_supervisor
|
|
||||||
fi
|
|
||||||
|
|
||||||
python3 -I /usr/local/go2rtc/create_config.py
|
|
||||||
else
|
|
||||||
echo "[WARNING] Unable to remove existing go2rtc config. Changes made to your frigate config file may not be recognized. Please remove the /dev/shm/go2rtc.yaml from your docker host manually."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# HomeKit persistence. The helper is symlink-safe; hand off to go2rtc only when dropping.
|
# HomeKit persistence. The helper is symlink-safe; hand off to go2rtc only when dropping.
|
||||||
readonly homekit_config_path="/config/go2rtc_homekit.yml"
|
readonly homekit_config_path="/config/go2rtc_homekit.yml"
|
||||||
|
|||||||
Reference in New Issue
Block a user