Merge pull request 'zerotier: enable networkd, better qemu vga' (#445) from Mic92-main into main
All checks were successful
assets1 / test (push) Successful in 11s
checks / test (push) Successful in 34s
checks-impure / test (push) Successful in 1m10s

This commit is contained in:
clan-bot 2023-10-31 14:40:22 +00:00
commit b2c6965ec3
2 changed files with 3 additions and 0 deletions

View File

@ -70,6 +70,8 @@ in
services.zerotierone.package = lib.mkDefault (pkgs.zerotierone.overrideAttrs (_old: { meta = { }; }));
})
(lib.mkIf (cfg.networkId != null) {
systemd.network.enable = true;
networking.useNetworkd = true;
systemd.network.networks.zerotier = {
matchConfig.Name = "zt*";
networkConfig = {

View File

@ -165,6 +165,7 @@ class BuildVmTask(BaseTask):
"-drive", f'cache=writeback,file={disk_img},format=raw,id=drive1,if=none,index=1,werror=report',
"-device", "virtio-blk-pci,bootindex=1,drive=drive1,serial=root",
"-device", "virtio-keyboard",
"-vga", "virtio",
"-usb",
"-device", "usb-tablet,bus=usb-bus.0",
"-kernel", f'{vm_config["toplevel"]}/kernel',