yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'move clanName into nixos machine configuration' (#630) from Mic92-main into main

Browse Source
This commit is contained in:
clan-bot
2023-12-08 15:21:59 +00:00
parent 73973c1f5e 9704b5bd6f
commit 57bded996b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixosModules/clanCore/vm.nix
View File

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

5
pkgs/clan-cli/clan_cli/vms/run.py
View File

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