fix: yield the console once the display manager starts

Since the boot only counted as complete when the default target was
reached, bootvine kept taking its terminal back from a display manager
that started while another unit still held graphical.target. The
StartupFinished signal was never parsed either, so nothing else ended
the watch.
This commit is contained in:
Willem Vanhulle committed 2026-10-24 20:00:29 +02:00
1 parent 58bef783cc
commit 631315ffe1
5 files changed
+128 -29

No files matched your search

+8
View File
@@ -17,6 +17,14 @@
settings.Manager.ShowStatus = lib.mkForce true;
services.demo-db.serviceConfig.ExecStop = lib.mkForce (waitFor "release-demo-db");
services.backdoor.before = [ "demo-db.service" ];
services.demo-late-sensor = {
wantedBy = [ "graphical.target" ];
after = [ "greetd.service" ];
serviceConfig = {
Type = "oneshot";
ExecStart = waitFor "release-late-sensor";
};
};
};
virtualisation = {
memorySize = 2048;
+4
View File
@@ -23,6 +23,10 @@ assert console_level() == "1", f"stage 2 sysctl reopened the kernel console: {co
machine.wait_for_unit("greetd.service")
retry(lambda _: unit_state("bootvine") == "inactive", timeout_seconds=60)
assert unit_state("demo-late-sensor") == "activating", "the boot finished before the display manager took over"
assert foreground_terminal() != f"tty{BOOTVINE_TERMINAL}", "bootvine took the console back from the display manager"
machine.succeed("touch /run/release-late-sensor")
machine.wait_for_unit("graphical.target")
journal = bootvine_journal()
print(journal)