mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
0bdba6c99b
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.
45 lines
1.2 KiB
Nix
45 lines
1.2 KiB
Nix
{ system ? builtins.currentSystem
|
|
, config ? {}
|
|
, pkgs ? import ../.. { inherit system config; }
|
|
, systemdStage1 ? false
|
|
}:
|
|
|
|
import ./make-test-python.nix {
|
|
name = "fsck";
|
|
|
|
nodes.machine = { lib, ... }: {
|
|
virtualisation.emptyDiskImages = [ 1 ];
|
|
|
|
virtualisation.fileSystems = {
|
|
"/mnt" = {
|
|
device = "/dev/vdb";
|
|
fsType = "ext4";
|
|
autoFormat = true;
|
|
};
|
|
};
|
|
|
|
boot.initrd.systemd.enable = systemdStage1;
|
|
};
|
|
|
|
testScript = { nodes, ...}:
|
|
let
|
|
rootDevice = nodes.machine.virtualisation.rootDevice;
|
|
in
|
|
''
|
|
machine.wait_for_unit("default.target")
|
|
|
|
with subtest("root fs is fsckd"):
|
|
machine.succeed("journalctl -b | grep '${if systemdStage1
|
|
then "fsck.*${builtins.baseNameOf rootDevice}.*clean"
|
|
else "fsck.ext4.*${rootDevice}"}'")
|
|
|
|
with subtest("mnt fs is fsckd"):
|
|
machine.succeed("journalctl -b | grep 'fsck.*vdb.*clean'")
|
|
machine.succeed(
|
|
"grep 'Requires=systemd-fsck@dev-vdb.service' /run/systemd/generator/mnt.mount"
|
|
)
|
|
machine.succeed(
|
|
"grep 'After=systemd-fsck@dev-vdb.service' /run/systemd/generator/mnt.mount"
|
|
)
|
|
'';
|
|
}
|