rename boot-tree to bootvine

This commit is contained in:
Willem Vanhulle committed 2026-10-11 15:54:28 +02:00
1 parent 101d7bae89
commit 2d586f57f7
21 files changed
+104 -104

No files matched your search

+2 -2
View File
@@ -19,7 +19,7 @@ def "main start" [--units: path, --target: string] {
install-units $units
^systemctl --user stop ...(unit-names $units)
^systemctl --user start --no-block $target
print $"started ($target); watch it with: boot-tree --user --target ($target) --hold 3s"
print $"started ($target); watch it with: bootvine --user --target ($target) --hold 3s"
}
def "main remove" [--units: path, --target: string] {
@@ -29,5 +29,5 @@ def "main remove" [--units: path, --target: string] {
}
def main [--units: path, --target: string] {
print "usage: boot-tree-demo-units (start | remove)"
print "usage: bootvine-demo-units (start | remove)"
}
+3 -3
View File
@@ -18,13 +18,13 @@ let
};
in
{
networking.hostName = "boot-tree-demo";
networking.hostName = "bootvine-demo";
system.stateVersion = "26.05";
boot.initrd.systemd = {
enable = true;
services.demo-initrd-probe = {
description = "boot-tree demo: slow initrd step";
description = "bootvine demo: slow initrd step";
wantedBy = [ "initrd.target" ];
before = [ "initrd.target" ];
unitConfig.DefaultDependencies = false;
@@ -35,7 +35,7 @@ in
};
};
services.boot-tree = {
services.bootvine = {
enable = true;
palette.running = "light-yellow";
};
+5 -5
View File
@@ -1,6 +1,6 @@
{ demoHost }:
{
name = "boot-tree";
name = "bootvine";
enableOCR = true;
nodes.machine =
@@ -27,18 +27,18 @@
machine.screenshot("stage-2")
machine.wait_for_unit("greetd.service")
machine.wait_until_succeeds("systemctl show -p ActiveState --value boot-tree | grep -qx inactive")
machine.wait_until_succeeds("systemctl show -p ActiveState --value bootvine | grep -qx inactive")
journal = machine.succeed("journalctl -b -u boot-tree -o cat")
journal = machine.succeed("journalctl -b -u bootvine -o cat")
print(journal)
watched = [line for line in journal.splitlines() if line.startswith("boot-tree: watching")]
watched = [line for line in journal.splitlines() if line.startswith("bootvine: watching")]
assert any(" in initrd " in line for line in watched), "never ran in the initrd"
assert any(" in stage 2 " in line for line in watched), "never reconnected after the root switch"
pids = {line.split(" as pid ")[1].split()[0] for line in watched}
assert len(pids) == 1, f"the initrd process did not survive the root switch: {pids}"
assert "handing the console over" in journal, "never handed the console over"
machine.succeed("test \"$(systemctl show -p Result --value boot-tree)\" = success")
machine.succeed("test \"$(systemctl show -p Result --value bootvine)\" = success")
console_level = machine.succeed("cut -f1 /proc/sys/kernel/printk").strip()
assert console_level != "1", f"kernel console level was not restored: {console_level}"
show_status = machine.succeed("systemctl show -p ShowStatus --value").strip()
+1 -1
View File
@@ -1,5 +1,5 @@
{
target = "boot-tree-demo";
target = "bootvine-demo";
initrdProbeSeconds = "6";
services = {
demo-disk.seconds = "2";
+4 -4
View File
@@ -14,7 +14,7 @@ let
name: spec:
writeText "${name}.service" (toUnitFile {
Unit = {
Description = "boot-tree demo: ${name}";
Description = "bootvine demo: ${name}";
After = map (dependency: "${dependency}.service") (spec.after or [ ]);
};
Service = {
@@ -30,13 +30,13 @@ let
targetFile = writeText "${demoUnits.target}.target" (toUnitFile {
Unit = {
Description = "boot-tree demo target";
Description = "bootvine demo target";
Wants = serviceNames;
After = serviceNames;
};
});
units = linkFarm "boot-tree-demo-units" (
units = linkFarm "bootvine-demo-units" (
lib.mapAttrsToList (name: spec: {
name = "${name}.service";
path = serviceFile name spec;
@@ -50,6 +50,6 @@ let
);
in
writeShellApplication {
name = "boot-tree-demo-units";
name = "bootvine-demo-units";
text = ''exec ${lib.getExe nushell} ${./demo-units.nu} "$@" --units ${units} --target ${demoUnits.target}.target'';
}