Sync velia
There are two new features:
- remote log upload
- PDU "hot-plugging"
The log upload requires the usual separation between startup and
running, so there's now a second EnvironmentFile for the service.
The PDU "hot-plugging" is a workaround for some device-specific errors
caused by the PSUs (which share the I2C bus with the PDU). Apparently,
the bus would end up with the SCL held low for hours/days/indefinitely,
and we have to keep velia-health running even if that is the case. The
root cause, which is "something wrong" in the PMBus communication, is
not fixed, but at least the whole system won't get unusable.
Unfortunately, a proper alarm is missing so far.
Change-Id: I72c1c5249077b99b3858dcb956b53e97b5505f60
diff --git a/board/czechlight/clearfog/overlay/usr/lib/systemd/system/systemd-journal-upload.service b/board/czechlight/clearfog/overlay/usr/lib/systemd/system/systemd-journal-upload.service
index f173525..e3172cb 100644
--- a/board/czechlight/clearfog/overlay/usr/lib/systemd/system/systemd-journal-upload.service
+++ b/board/czechlight/clearfog/overlay/usr/lib/systemd/system/systemd-journal-upload.service
@@ -1,7 +1,7 @@
# CzechLight-specific configuration:
#
# - do not record a failed unit when that thing dies (likely due to a network issue)
-# - only start when a custom config file exists
+# - only start when at least one of the custom config file exists
# - do not bring in a network-online.target because that might trigger
# extra failure reports (and a watchdog action)
# - keep retrying upon failure(s)
@@ -31,8 +31,10 @@
# - ignore failures
# - read (one) location from the env file
+# - /run has priority
ExecStart=-/usr/lib/systemd/systemd-journal-upload --save-state --url=${DESTINATION}
EnvironmentFile=-/cfg/journald-remote
+EnvironmentFile=-/run/journald-remote
# run forever and ignore any network issues
Restart=always
@@ -40,4 +42,6 @@
[Unit]
# shared as an env file
-ConditionFileNotEmpty=/cfg/journald-remote
+# at least one of these files must exist
+ConditionFileNotEmpty=|/cfg/journald-remote
+ConditionFileNotEmpty=|/run/journald-remote
diff --git a/submodules/velia b/submodules/velia
index cd7f9cc..e259aaa 160000
--- a/submodules/velia
+++ b/submodules/velia
@@ -1 +1 @@
-Subproject commit cd7f9cc51bb9cc0090cab0fd4cdf34673faa79ca
+Subproject commit e259aaa8ca99fb03d6adae839f3db204a3dd1e46