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

drop unused mounts

Browse Source
This commit is contained in:
Jörg Thalheim
2024-02-09 16:40:10 +01:00
parent 1c1b613598
commit 4c6a95c844
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
nixosModules/clanCore/vm.nix
View File

@@ -34,10 +34,16 @@ let
boot.initrd.kernelModules = [ "virtiofs" ];
virtualisation.writableStore = false;
virtualisation.fileSystems = {
virtualisation.fileSystems = lib.mkForce ({
"/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
options = [ "defaults" "x-systemd.makefs" ];
};
"/nix/store" = {
options = lib.mkForce [ "x-systemd.requires=systemd-modules-load.service" ];
fsType = lib.mkForce "virtiofs";
device = "nix-store";
options = [ "x-systemd.requires=systemd-modules-load.service" ];
fsType = "virtiofs";
};
"/vmstate" = {
@@ -46,18 +52,21 @@ let
options = [ "x-systemd.makefs" ];
};
${config.clanCore.secretsUploadDirectory} = lib.mkForce {
${config.clanCore.secretsUploadDirectory} = {
device = "secrets";
fsType = "9p";
neededForBoot = true;
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
};
} // lib.listToAttrs (map (folder:
lib.nameValuePair folder {
device = "/vmstate${folder}";
fsType = "none";
options = ["bind"];
}) stateFolders);
} // lib.listToAttrs (map
(folder:
lib.nameValuePair folder {
device = "/vmstate${folder}";
fsType = "none";
options = [ "bind" ];
})
stateFolders));
};
# We cannot simply merge the VM config into the current system config, because