Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion boxd/internal/daemon/thermals.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
// flags, sampled once a minute into the journal (one line per sample, so
// `journalctl -u boxd` doubles as a temperature log) and reported through
// /v1/info for the room's Screens list (stage 4). vcgencmd is the
// Raspberry Pi firmware tool (libraspberrypi-bin); where it is missing —
// Raspberry Pi firmware tool (raspi-utils-core); where it is missing —
// a dev machine, a test — thermals simply go unreported and everything
// downstream tolerates their absence.
const thermalsEvery = time.Minute
Expand Down
2 changes: 1 addition & 1 deletion docs/adr/0008-watchdogs-and-self-healing.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ procedure in docs/testing.md.
### 3. Thermals: sample, log, report

boxd runs `vcgencmd measure_temp` and `vcgencmd get_throttled`
(`libraspberrypi-bin`, installed with this stage) once a minute, logs
(`raspi-utils-core`, installed with this stage) once a minute, logs
one journal line per sample (`journalctl -u boxd` doubles as a
temperature log, and journald is persistent on /data), and reports the
latest values in `GET /v1/info` — `temperatureC`, `throttled`,
Expand Down
6 changes: 4 additions & 2 deletions scripts/smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ fi
# --- packages ---------------------------------------------------------------
for pkg in cage chromium fonts-noto-color-emoji libgl1-mesa-dri cloud-init avahi-daemon \
pipewire pipewire-bin pipewire-alsa pipewire-pulse wireplumber pulseaudio-utils alsa-utils \
libraspberrypi-bin systemd-timesyncd v4l-utils; do
raspi-utils-core systemd-timesyncd v4l-utils; do
if sudo awk -v p="${pkg}" '
$0 == "Package: " p { inpkg = 1 }
inpkg && /^Status: / {
Expand Down Expand Up @@ -374,7 +374,9 @@ USER_UNITS="var/lib/syncphony-box/.config/systemd/user"
for unit in default.target.wants/pipewire.service default.target.wants/wireplumber.service \
default.target.wants/pipewire-pulse.service sockets.target.wants/pipewire.socket \
sockets.target.wants/pipewire-pulse.socket; do
if sudo test -e "${WORK}/root/${USER_UNITS}/${unit}" &&
# -L, not -e: the links are absolute, so -e would follow them on the
# build host rather than inside the image. The target is checked below.
if sudo test -L "${WORK}/root/${USER_UNITS}/${unit}" &&
sudo test -e "${WORK}/root/usr/lib/systemd/user/${unit##*/}"; then
check "kiosk user unit ${unit##*/} enabled" ok
else
Expand Down
Empty file modified stage-syncphony/06-readonly-root/00-run.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions stage-syncphony/07-watchdog/00-packages
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Watchdogs and self-healing (MAD-806): vcgencmd (libraspberrypi-bin) is
# Watchdogs and self-healing (MAD-806): vcgencmd (raspi-utils-core) is
# what boxd samples every minute for the temperature and throttling log,
# and systemd-timesyncd gives the box a sane clock before the kiosk starts
# (a Pi has no RTC battery by default).
libraspberrypi-bin
raspi-utils-core
systemd-timesyncd
Empty file modified stage-syncphony/07-watchdog/00-run.sh
100644 → 100755
Empty file.
Empty file modified stage-syncphony/08-cec/00-run.sh
100644 → 100755
Empty file.
Loading