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:
9 files changed
+169
-41
No files matched your search
@@ -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";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -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")]
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
../shared/recorded-display.nix
|
||||
];
|
||||
testing.initrdBackdoor = true;
|
||||
boot.kernelParams = lib.mkAfter [ "console=tty0" ];
|
||||
boot.initrd.systemd.services.initrd-hardware-probe.serviceConfig.ExecStart = lib.mkForce (
|
||||
waitFor "release-initrd-hardware-probe"
|
||||
);
|
||||
|
||||
@@ -6,6 +6,17 @@ def unit_state(unit):
|
||||
return machine.succeed(f"systemctl is-active {unit} || true").strip()
|
||||
|
||||
|
||||
def foreground_console_text():
|
||||
terminal_number = foreground_terminal().removeprefix("tty")
|
||||
return machine.succeed(f"tr -cd '[:print:]' < /dev/vcs{terminal_number}")
|
||||
|
||||
|
||||
def assert_unit_start_stays_off_console(description):
|
||||
machine.succeed(f"systemd-run --wait --description='{description}' /run/current-system/sw/bin/true")
|
||||
console_text = foreground_console_text()
|
||||
assert description not in console_text, f"systemd status reached the login screen:\n{console_text}"
|
||||
|
||||
|
||||
recording = ScreenRecording(machine)
|
||||
machine.start()
|
||||
recording.start()
|
||||
@@ -24,11 +35,17 @@ assert_text_visible(font_has_512_glyphs=True)
|
||||
assert console_level() == "1", f"stage 2 sysctl reopened the kernel console: {console_level()}"
|
||||
|
||||
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 foreground_terminal() != f"tty{BOOTVINE_TERMINAL}", "bootvine took the console back from the display manager"
|
||||
machine.wait_until_tty_matches("1", "login: ")
|
||||
assert_unit_start_stays_off_console("Mid boot status probe")
|
||||
show_status = machine.succeed("systemctl show -p ShowStatus --value").strip()
|
||||
assert show_status == "no", f"systemd status output came back before the boot finished: {show_status}"
|
||||
assert unit_state("bootvine") == "active", "bootvine left before the boot finished"
|
||||
machine.succeed("touch /run/release-late-sensor-probe")
|
||||
machine.wait_for_unit("graphical.target")
|
||||
retry(lambda _: unit_state("bootvine") == "inactive", timeout_seconds=60)
|
||||
|
||||
journal = bootvine_journal()
|
||||
print(journal)
|
||||
@@ -43,6 +60,13 @@ machine.succeed('test "$(systemctl show -p Result --value bootvine)" = success')
|
||||
assert console_level() != "1", f"kernel console level was not restored: {console_level()}"
|
||||
show_status = machine.succeed("systemctl show -p ShowStatus --value").strip()
|
||||
assert show_status == "yes", f"systemd status output was not restored: {show_status}"
|
||||
assert_unit_start_stays_off_console("Post boot status probe")
|
||||
|
||||
machine.wait_until_tty_matches("1", "login: ")
|
||||
machine.send_chars("sample-user\n")
|
||||
machine.wait_until_tty_matches("1", "Password: ")
|
||||
machine.send_chars("sample-user\n")
|
||||
machine.wait_until_succeeds("pgrep -u sample-user bash", timeout=30)
|
||||
|
||||
foreground = foreground_terminal()
|
||||
assert foreground != f"tty{BOOTVINE_TERMINAL}", "bootvine kept the console after handing it over"
|
||||
|
||||
Reference in new issue
Block a user