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

Merge pull request 'zerotier: enable networkd, better qemu vga' (#445) from Mic92-main into main

Browse Source
This commit is contained in:
clan-bot
2023-10-31 14:40:22 +00:00
parent 43f689c1db 53b5e989ee
commit f20982ec9c
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixosModules/clanCore/zerotier/default.nix
View File

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

1
pkgs/clan-cli/clan_cli/vms/create.py
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', "-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-blk-pci,bootindex=1,drive=drive1,serial=root",
"-device", "virtio-keyboard", "-device", "virtio-keyboard",
"-vga", "virtio",
"-usb", "-usb",
"-device", "usb-tablet,bus=usb-bus.0", "-device", "usb-tablet,bus=usb-bus.0",
"-kernel", f'{vm_config["toplevel"]}/kernel', "-kernel", f'{vm_config["toplevel"]}/kernel',