nixos/vms: Fix LVM disk helper regression

Adding volume-group support changed the LVM disk helper's argument
meaning, so standard VM disks and the legacy darts calls resolved disk
names as volume groups.

Restore the main volume group for standard disks and map the differently
named darts volumes explicitly.
This commit is contained in:
2026-08-01 23:41:36 +01:00
parent e47e30df19
commit 43b5bedb48
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -191,7 +191,7 @@ rec {
};
lvmDisk' = vg: lv: lvmDisk'' lv vg lv;
lvmDisk = lvmDisk' "main";
disk = vm: lv: lvmDisk' lv "vm-${vm}-${lv}";
disk = vm: lv: lvmDisk'' lv "main" "vm-${vm}-${lv}";
};
deploy-rs =
+2 -2
View File
@@ -212,8 +212,8 @@
cleanShutdown.timeout = 120;
drives = [
(mkMerge [ (vm.disk "darts" "root") { frontendOpts.bootindex = 0; } ])
(vm.lvmDisk' "media" "darts-media")
(vm.lvmDisk' "ext" "darts-ext")
(vm.lvmDisk'' "media" "main" "darts-media")
(vm.lvmDisk'' "ext" "main" "darts-ext")
];
};
};