Merge pull request #224171 from alan-strohm/master

nixos/proxmox-image: don't assume virtio0 is using local-lvm storage
This commit is contained in:
Sandro 2023-04-16 03:30:46 +02:00 committed by GitHub
commit 893f073fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -135,10 +135,11 @@ with lib;
cfgLine = name: value: '' cfgLine = name: value: ''
${name}: ${builtins.toString value} ${name}: ${builtins.toString value}
''; '';
virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0);
cfgFile = fileName: properties: pkgs.writeTextDir fileName '' cfgFile = fileName: properties: pkgs.writeTextDir fileName ''
# generated by NixOS # generated by NixOS
${lib.concatStrings (lib.mapAttrsToList cfgLine properties)} ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)}
#qmdump#map:virtio0:drive-virtio0:local-lvm:raw: #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw:
''; '';
inherit (cfg) partitionTableType; inherit (cfg) partitionTableType;
supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid"; supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid";