diff options
author | nikstur <nikstur@outlook.com> | 2023-06-08 02:34:10 +0200 |
---|---|---|
committer | nikstur <nikstur@outlook.com> | 2023-06-16 19:36:03 +0200 |
commit | 0bdba6c99bc6db6fd8ea15de3fa10a3c0563ef9f (patch) | |
tree | 3832d42f8bd90def02748e604d3bcc4de9287341 /nixos/tests/systemd-initrd-luks-password.nix | |
parent | aa337560aa64b13276883a3197eb1eeff6678378 (diff) |
nixos/qemu-vm: use persistent block device names
This change removes the bespoke logic around identifying block devices. Instead of trying to find the right device by iterating over `qemu.drives` and guessing the right partition number (e.g. /dev/vda{1,2}), devices are now identified by persistent names provided by udev in /dev/disk/by-*. Before this change, the root device was formatted on demand in the initrd. However, this makes it impossible to use filesystem identifiers to identify devices. Now, the formatting step is performed before the VM is started. Because some tests, however, rely on this behaviour, a utility function to replace this behaviour in added in /nixos/tests/common/auto-format-root-device.nix. Devices that contain neither a partition table nor a filesystem are identified by their hardware serial number which is injecetd via QEMU (and is thus persistent and predictable). PCI paths are not a reliably way to identify devices because their availability and numbering depends on the QEMU machine type. This change makes the module more robust against changes in QEMU and the kernel (non-persistent device naming) and by decoupling abstractions (i.e. rootDevice, bootPartition, and bootLoaderDevice) enables further improvement down the line.
Diffstat (limited to 'nixos/tests/systemd-initrd-luks-password.nix')
-rw-r--r-- | nixos/tests/systemd-initrd-luks-password.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/tests/systemd-initrd-luks-password.nix b/nixos/tests/systemd-initrd-luks-password.nix index a90a59feed6fa..66b5022d87fdc 100644 --- a/nixos/tests/systemd-initrd-luks-password.nix +++ b/nixos/tests/systemd-initrd-luks-password.nix @@ -25,6 +25,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { cryptroot2.device = "/dev/vdc"; }; virtualisation.rootDevice = "/dev/mapper/cryptroot"; + virtualisation.fileSystems."/".autoFormat = true; # test mounting device unlocked in initrd after switching root virtualisation.fileSystems."/cryptroot2".device = "/dev/mapper/cryptroot2"; }; |