Skip to content

Loosen currentOsVariantOverride idempotence check #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptr727 merged 1 commit into from
May 25, 2026
Merged

Loosen currentOsVariantOverride idempotence check #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ sudo /opt/${COMPANY_NAME}/mediaserver/bin/root-tool &
# https://github.com/networkoptix/nxvms-docker/commit/54bbd16
# Inject at runtime rather than build time because the recommended non-LSIO setup
# bind-mounts /opt/${COMPANY_NAME}/mediaserver/etc from the host, which hides any
# build-time edit. Idempotent so subsequent starts don't duplicate the line.
# build-time edit. Check for any `currentOsVariantOverride=` key (regardless of
# value) so we never duplicate the line on subsequent starts and never override
# a value the user explicitly set themselves.
MEDIASERVER_CONF="/opt/${COMPANY_NAME}/mediaserver/etc/mediaserver.conf"
if ! grep -q "^currentOsVariantOverride=docker" "${MEDIASERVER_CONF}" 2>/dev/null
if ! grep -q "^currentOsVariantOverride=" "${MEDIASERVER_CONF}" 2>/dev/null
then
echo "Adding currentOsVariantOverride=docker to ${MEDIASERVER_CONF}"
echo "currentOsVariantOverride=docker" >> "${MEDIASERVER_CONF}"
Expand Down
5 changes: 4 additions & 1 deletion Docker/s6-overlay/s6-rc.d/init-nx-relocate/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,11 @@ fi
# https://github.com/networkoptix/nxvms-docker/commit/54bbd16
# Inject at runtime rather than build time because the etc directory above is replaced
# by a symlink to /config/etc on first start, which would erase any build-time edit.
# Check for any `currentOsVariantOverride=` key (regardless of value) so we never
# duplicate the line on subsequent starts and never override a value the user
# explicitly set themselves.
MEDIASERVER_CONF="/config/etc/mediaserver.conf"
if ! grep -q "^currentOsVariantOverride=docker" "${MEDIASERVER_CONF}" 2>/dev/null
if ! grep -q "^currentOsVariantOverride=" "${MEDIASERVER_CONF}" 2>/dev/null
then
echo "Adding currentOsVariantOverride=docker to ${MEDIASERVER_CONF}"
echo "currentOsVariantOverride=docker" >> "${MEDIASERVER_CONF}"
Expand Down