mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2024-12-25 08:21:07 +00:00
55594274f7
v14.4.5 introduced a new way to retrieve the host logs by symlinking the log directories into the host /run/log/journal and using a local copy of the journalctl binary instead of chrooting into the host. This failed to account for the location of persistent logs when that option is turned on (/var/log/journal instead of /run/log/journal). This fixes the checks consider this case and also makes sure to remove the original symlink to avoid having nested links `/run/log/journal/journal/journal`, which was a bug in the previous implementation. Change-type: patch
79 lines
3.2 KiB
Bash
Executable File
79 lines
3.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
set -o errexit
|
|
|
|
# If the legacy /tmp/resin-supervisor exists on the host, a container might
|
|
# already be using to take an update lock, so we symlink it to the new
|
|
# location so that the supervisor can see it
|
|
[ -d /mnt/root/tmp/resin-supervisor ] &&
|
|
([ -d /mnt/root/tmp/balena-supervisor ] || ln -s ./resin-supervisor /mnt/root/tmp/balena-supervisor)
|
|
|
|
# Otherwise, if the lockfiles directory doesn't exist
|
|
[ -d /mnt/root/tmp/balena-supervisor ] ||
|
|
mkdir -p /mnt/root/tmp/balena-supervisor
|
|
|
|
export DBUS_SYSTEM_BUS_ADDRESS="${DBUS_SYSTEM_BUS_ADDRESS:-unix:path=/mnt/root/run/dbus/system_bus_socket}"
|
|
|
|
# Include self-signed CAs, should they exist
|
|
if [ -n "${BALENA_ROOT_CA}" ]; then
|
|
if [ ! -e '/etc/ssl/certs/balenaRootCA.pem' ]; then
|
|
echo "${BALENA_ROOT_CA}" >/etc/ssl/certs/balenaRootCA.pem
|
|
|
|
# Include the balenaRootCA in the system store for services like Docker
|
|
mkdir -p /usr/local/share/ca-certificates
|
|
echo "${BALENA_ROOT_CA}" >/usr/local/share/ca-certificates/balenaRootCA.crt
|
|
update-ca-certificates
|
|
fi
|
|
fi
|
|
|
|
# Setup necessary directories for journalctl
|
|
# NOTE: this won't be necessary once the supervisor can update
|
|
# itself, as using the label io.balena.features.journal-logs will
|
|
# achieve the same objective
|
|
if { [ ! -d /run/log/journal ] || [ -L /run/log/journal ]; } && [ -s /mnt/root/etc/machine-id ]; then
|
|
# Only enter here if the directory does not exist or the location exists and is a symlink
|
|
# (note that test -d /symlink-to-dir will return true)
|
|
|
|
# Create the directory
|
|
mkdir -p /run/log
|
|
|
|
# Override the local machine-id
|
|
ln -sf /mnt/root/etc/machine-id /etc/machine-id
|
|
|
|
# Remove the original link if it exists to avoid creating deep links
|
|
[ -L /run/log/journal ] && rm /run/log/journal
|
|
|
|
# If using persistent logging, the host will the journal under `/var/log/journal`
|
|
# otherwise it will have it under /run/log/journal
|
|
[ -d "/mnt/root/run/log/journal/$(cat /etc/machine-id)" ] && ln -sf /mnt/root/run/log/journal /run/log/journal
|
|
[ -d "/mnt/root/var/log/journal/$(cat /etc/machine-id)" ] && ln -sf /mnt/root/var/log/journal /run/log/journal
|
|
fi
|
|
|
|
# Mount the host kernel module path onto the expected location
|
|
# We need to do this as busybox doesn't support using a custom location
|
|
if [ ! -d /lib/modules ]; then
|
|
ln -s /mnt/root/lib/modules /lib/modules
|
|
fi
|
|
# Now load the ip6_tables kernel module, so we can do
|
|
# filtering on ipv6 addresses. Don't fail here if the
|
|
# modprobe fails, as this can either be that the module is
|
|
# already loaded or that the kernel module isn't present. In
|
|
# the former case, this is fine for runtime, and in the
|
|
# latter it means that the supervisor will fail later on, so
|
|
# not a problem.
|
|
modprobe ip6_tables || true
|
|
|
|
export BASE_LOCK_DIR="/tmp/balena-supervisor/services"
|
|
export LOCKFILE_UID=65534
|
|
|
|
# Cleanup leftover Supervisor-created lockfiles from any previous processes.
|
|
# Supervisor-created lockfiles have a UID of 65534.
|
|
find "/mnt/root${BASE_LOCK_DIR}" -type f -user "${LOCKFILE_UID}" -name "*updates.lock" -delete || true
|
|
|
|
if [ "${LIVEPUSH}" = "1" ]; then
|
|
exec npx nodemon --watch src --watch typings --ignore tests -e js,ts,json \
|
|
--exec node -r ts-node/register/transpile-only src/app.ts
|
|
else
|
|
exec node /usr/src/app/dist/app.js
|
|
fi
|