From a43c2c1e70affcd96d983081e75b7afcb996ca92 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 30 Nov 2021 01:29:43 +0100 Subject: [PATCH] Revert "nixos/tests/installer: lvm: test lvm2-pvscan@ units" This reverts commit 53a34361afe7b58db95c77cd99f268fd933e4053. --- nixos/tests/installer.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index bc41b6efc2e7..cf00bcafe4f1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -561,26 +561,16 @@ in { + " mkpart primary 2048M -1s" # PV2 + " set 2 lvm on", "udevadm settle", - "sleep 1", "pvcreate /dev/vda1 /dev/vda2", - "sleep 1", "vgcreate MyVolGroup /dev/vda1 /dev/vda2", - "sleep 1", "lvcreate --size 1G --name swap MyVolGroup", - "sleep 1", "lvcreate --size 3G --name nixos MyVolGroup", - "sleep 1", "mkswap -f /dev/MyVolGroup/swap -L swap", "swapon -L swap", "mkfs.xfs -L nixos /dev/MyVolGroup/nixos", "mount LABEL=nixos /mnt", ) ''; - postBootCommands = '' - assert "loaded active" in machine.succeed( - "systemctl list-units 'lvm2-pvscan@*' -ql --no-legend | tee /dev/stderr" - ) - ''; }; # Boot off an encrypted root partition with the default LUKS header format