Merge pull request 'move clanName into nixos machine configuration' (#630) from Mic92-main into main
All checks were successful
assets1 / test (push) Successful in 18s
checks-impure / test (push) Successful in 1m11s
checks / test (push) Successful in 2m0s

This commit is contained in:
clan-bot 2023-12-08 15:21:59 +00:00
commit 57bded996b
2 changed files with 5 additions and 1 deletions

View File

@ -11,6 +11,7 @@ let
neededForBoot = true;
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
};
boot.initrd.systemd.enable = true;
}
];
};

View File

@ -59,14 +59,16 @@ def qemu_command(
xchg_dir: Path,
secrets_dir: Path,
disk_img: Path,
wayland: bool,
) -> list[str]:
kernel_cmdline = [
(Path(nixos_config["toplevel"]) / "kernel-params").read_text(),
f'init={nixos_config["toplevel"]}/init',
f'regInfo={nixos_config["regInfo"]}/registration',
"console=ttyS0,115200n8",
"console=tty0",
]
if not wayland:
kernel_cmdline.append("console=tty0")
# fmt: off
command = [
"qemu-kvm",
@ -244,6 +246,7 @@ def run_vm(
xchg_dir=xchg_dir,
secrets_dir=secrets_dir,
disk_img=disk_img,
wayland=vm.wayland,
)
if vm.wayland: