diff --git a/nixosModules/clanCore/vm.nix b/nixosModules/clanCore/vm.nix index 181e3b188..0c171e1c8 100644 --- a/nixosModules/clanCore/vm.nix +++ b/nixosModules/clanCore/vm.nix @@ -11,6 +11,7 @@ let neededForBoot = true; options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; }; + boot.initrd.systemd.enable = true; } ]; }; diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py index b28bf1ebe..9ac0e8c84 100644 --- a/pkgs/clan-cli/clan_cli/vms/run.py +++ b/pkgs/clan-cli/clan_cli/vms/run.py @@ -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: