b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #234030 from NixOS/cleanup-overlay-mounts

Browse source 
nixosTests: fix tests that relies on an empty rootfs using a bootloader
This commit is contained in:
Ryan Lahfa 2023-06-08 18:20:23 +02:00 committed by GitHub
parent d604f5fd92 89952f7bb6
commit a384c9b01d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/tests/initrd-luks-empty-passphrase.nix
View file

@ -18,6 +18,11 @@ in {
emptyDiskImages = [ 512 ];
useBootLoader = true;
useEFIBoot = true;
# This requires to have access
# to a host Nix store as
# the new root device is /dev/vdb
# an empty 512MiB drive, containing no Nix store.
mountHostNixStore = true;
};
boot.loader.systemd-boot.enable = true;

2
nixos/tests/luks.nix
View file

@ -7,6 +7,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
emptyDiskImages = [ 512 512 ];
useBootLoader = true;
useEFIBoot = true;
# To boot off the encrypted disk, we need to have a init script which comes from the Nix store
mountHostNixStore = true;
};
boot.loader.systemd-boot.enable = true;

2
nixos/tests/lvm2/systemd-stage-1.nix
View file

@ -65,6 +65,8 @@ in import ../make-test-python.nix ({ pkgs, ... }: {
emptyDiskImages = [ 8192 8192 ];
useBootLoader = true;
useEFIBoot = true;
# To boot off the LVM disk, we need to have a init script which comes from the Nix store.
mountHostNixStore = true;
};
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

2
nixos/tests/systemd-initrd-btrfs-raid.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = {
emptyDiskImages = [ 512 512 ];
useBootLoader = true;
# Booting off the BTRFS RAID requires an available init script from the Nix store
mountHostNixStore = true;
useEFIBoot = true;
};
boot.loader.systemd-boot.enable = true;

2
nixos/tests/systemd-initrd-luks-fido2.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = {
emptyDiskImages = [ 512 ];
useBootLoader = true;
# Booting off the encrypted disk requires having a Nix store available for the init script
mountHostNixStore = true;
useEFIBoot = true;
qemu.package = lib.mkForce (pkgs.qemu_test.override { canokeySupport = true; });
qemu.options = [ "-device canokey,file=/tmp/canokey-file" ];

2
nixos/tests/systemd-initrd-luks-keyfile.nix
View file

@ -14,6 +14,8 @@ in {
virtualisation = {
emptyDiskImages = [ 512 ];
useBootLoader = true;
# Necessary to boot off the encrypted disk because it requires a init script coming from the Nix store
mountHostNixStore = true;
useEFIBoot = true;
};
boot.loader.systemd-boot.enable = true;

2
nixos/tests/systemd-initrd-luks-password.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = {
emptyDiskImages = [ 512 512 ];
useBootLoader = true;
# Booting off the encrypted disk requires an available init script
mountHostNixStore = true;
useEFIBoot = true;
};
boot.loader.systemd-boot.enable = true;

2
nixos/tests/systemd-initrd-luks-tpm2.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = {
emptyDiskImages = [ 512 ];
useBootLoader = true;
# Booting off the TPM2-encrypted device requires an available init script
mountHostNixStore = true;
useEFIBoot = true;
qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"];
};

8
nixos/tests/systemd-initrd-networkd-ssh.nix
View file

@ -10,13 +10,15 @@ import ./make-test-python.nix ({ lib, ... }: {
virtualisation = {
emptyDiskImages = [ 4096 ];
useBootLoader = true;
# Booting off the encrypted disk requires an available init script from the Nix store
mountHostNixStore = true;
useEFIBoot = true;
};
specialisation.encrypted-root.configuration = {
virtualisation.bootDevice = "/dev/mapper/root";
virtualisation.rootDevice = "/dev/mapper/root";
boot.initrd.luks.devices = lib.mkVMOverride {
root.device = "/dev/vdc";
root.device = "/dev/vdb";
};
boot.initrd.systemd.enable = true;
boot.initrd.network = {
@ -61,7 +63,7 @@ import ./make-test-python.nix ({ lib, ... }: {
server.wait_for_unit("multi-user.target")
server.succeed(
"echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdc",
"echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb",
"bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf",
"sync",
)

2
nixos/tests/systemd-initrd-swraid.nix
View file

@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
virtualisation = {
emptyDiskImages = [ 512 512 ];
useBootLoader = true;
# Booting off the RAID requires an available init script
mountHostNixStore = true;
useEFIBoot = true;
};
boot.loader.systemd-boot.enable = true;