Merge pull request 'zerotier: enable networkd, better qemu vga' (#445) from Mic92-main into main
This commit is contained in:
commit
b2c6965ec3
@ -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 = {
|
||||
|
@ -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',
|
||||
|
Loading…
Reference in New Issue
Block a user