fix: keep systemd status off the display manager until the boot finishes

bootvine restored systemd's status output as soon as a display manager took
the console. greetd's Type=idle only waits five seconds, so jobs still running
then wrote status lines over the login screen.

Restore the output when StartupFinished arrives instead, through a single
private path that owns the console watch. A quit key or stopping the service
still restores it at once, so a stuck boot stays visible.
This commit is contained in:
Willem Vanhulle committed 2026-11-04 19:59:30 +01:00
1 parent d0833ad563
commit 89eec1ddaf
9 files changed
+169 -41

No files matched your search

+14 -3
View File
@@ -12,9 +12,20 @@
machine
../shared/recorded-display.nix
];
systemd.services = {
sample-database.serviceConfig.ExecStop = lib.mkForce (waitFor "release-sample-database");
backdoor.before = [ "sample-database.service" ];
systemd = {
settings.Manager.ShowStatus = lib.mkForce true;
services = {
sample-database.serviceConfig.ExecStop = lib.mkForce (waitFor "release-sample-database");
backdoor.before = [ "sample-database.service" ];
late-sensor-probe = {
wantedBy = [ "graphical.target" ];
after = [ "greetd.service" ];
serviceConfig = {
Type = "oneshot";
ExecStart = waitFor "release-late-sensor-probe";
};
};
};
};
};
+23 -1
View File
@@ -10,8 +10,30 @@ wait_for_screen("Stage 2", "sample-database")
assert_bootvine_in_front()
assert_text_visible(font_has_512_glyphs=True)
machine.succeed("timeout 10 systemctl stop bootvine")
machine.succeed("systemctl start --no-block bootvine")
retry(lambda _: foreground_terminal() == f"tty{BOOTVINE_TERMINAL}", timeout_seconds=30)
wait_for_screen("Stage 2")
machine.send_chars("q")
retry(lambda _: unit_state("bootvine") == "inactive", timeout_seconds=10)
assert foreground_terminal() != f"tty{BOOTVINE_TERMINAL}", "the quit key left bootvine in front"
show_status = machine.succeed("systemctl show -p ShowStatus --value").strip()
assert show_status == "yes", f"the quit key did not restore the status output: {show_status}"
machine.succeed("systemctl start --no-block bootvine")
retry(lambda _: foreground_terminal() == f"tty{BOOTVINE_TERMINAL}", timeout_seconds=30)
machine.wait_for_unit("greetd.service")
retry(lambda _: unit_state("bootvine") == "inactive", timeout_seconds=60)
retry(lambda _: "another program took the console" in bootvine_journal(), timeout_seconds=60)
assert unit_state("late-sensor-probe") == "activating", "the boot finished before the display manager took over"
assert unit_state("bootvine") == "active", "bootvine left before the boot finished"
machine.succeed("timeout 10 systemctl stop bootvine")
assert unit_state("bootvine") == "inactive", "stopping bootvine during the boot did not end it"
show_status = machine.succeed("systemctl show -p ShowStatus --value").strip()
assert show_status == "yes", f"stopping bootvine did not restore the status output: {show_status}"
machine.succeed("touch /run/release-late-sensor-probe")
machine.wait_for_unit("graphical.target")
journal = bootvine_journal()
print(journal)
watched = [line for line in journal.splitlines() if line.startswith("bootvine: watching")]