feat: provision Chrome and DVD codecs without a manual step
A fresh classroom needed two things installed by hand on every box: Google Chrome, which is not in Debian, and the DVD codecs, which Debian cannot ship. Both now happen on their own. ekklesia-classroom-provision.service runs after every boot and does the work that needs the network and the apt lock, neither of which a package postinst can have. Each step returns immediately if it is already done, so a provisioned machine costs nothing and a machine that was offline the first time gets another go at the next boot. Nothing there is allowed to fail the boot: a classroom with no DVD codecs is still a working classroom, and it says so in the log rather than silently. The postinst enables the service but deliberately does not start it. Every OTA update reboots the moment the install finishes, and an apt run killed by that reboot would leave dpkg half-configured. Chrome comes from Google's own repository rather than a one-off .deb, so it keeps getting security updates. Google's package migrates whatever we write into a deb822 file of its own, so the repository is looked for across every source file instead of only the one we would write; otherwise a machine that had Chrome removed would end up with two copies of the same repository. The DVD codec helper previously assumed deb822 sources and did nothing on a machine using a classic /etc/apt/sources.list, which is what the hardware actually runs. It now handles both formats, and only ever adds a missing component to an existing Debian entry — so it cannot produce a duplicate repository or a duplicate component however many times it runs, and third-party repositories like Chrome's are never touched. It also answers libdvd-pkg's debconf questions, so nothing blocks on a prompt in a service with no terminal. Tested against fixture APT trees for classic sources.list, deb822 .sources, contrib already enabled, repeated runs, third-party repositories and the awkward real lines: bracketed options, indentation, trailing comments and flat repositories. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 5
parent
c81fc1b0b9
commit
a3dba6e8fb
Executable
+41
@@ -0,0 +1,41 @@
|
||||
#!/bin/bash
|
||||
set -uo pipefail
|
||||
|
||||
# Finishes setting a classroom machine up: the things that need the
|
||||
# network and the apt lock, and so cannot run from the package postinst.
|
||||
#
|
||||
# Run from ekklesia-classroom-provision.service at every boot. Each step
|
||||
# checks whether it is already done and returns immediately if so, so a
|
||||
# provisioned machine costs nothing, and a machine that was offline the
|
||||
# first time gets another go at the next boot.
|
||||
#
|
||||
# Nothing here is allowed to fail the boot. A classroom with no DVD
|
||||
# codecs is still a working classroom.
|
||||
|
||||
log() {
|
||||
echo "[classroom-provision] $1"
|
||||
}
|
||||
|
||||
log "starting"
|
||||
|
||||
if /usr/local/bin/classroom-chrome-setup; then
|
||||
:
|
||||
else
|
||||
log "WARNING: Google Chrome is not installed. The Browser button will"
|
||||
log "WARNING: not work until this succeeds. Retrying at the next boot,"
|
||||
log "WARNING: or run: sudo classroom-chrome-setup"
|
||||
fi
|
||||
|
||||
# DVD codecs are only fetched for rooms that actually have a drive.
|
||||
if /usr/local/bin/classroom-dvd-css-setup --if-enabled; then
|
||||
:
|
||||
else
|
||||
log "WARNING: commercial DVD support is not set up. Unencrypted discs"
|
||||
log "WARNING: still play. Retrying at the next boot, or run:"
|
||||
log "WARNING: sudo classroom-dvd-css-setup"
|
||||
fi
|
||||
|
||||
log "finished"
|
||||
|
||||
# Provisioning is best-effort by design.
|
||||
exit 0
|
||||
Reference in New Issue
Block a user