diff options
author | Will Fancher <elvishjerricco@gmail.com> | 2022-04-17 17:24:13 -0400 |
---|---|---|
committer | Will Fancher <elvishjerricco@gmail.com> | 2022-04-17 18:31:35 -0400 |
commit | 9ee5d61a16c1a00ae4864a632aba2c297faa81c3 (patch) | |
tree | e1e186e63b3337477237e86fb3bc171c3fd9c805 /nixos/tests | |
parent | 9e8b463cce747c63884f911113fd3dd943d04278 (diff) | |
download | nixpkgs-9ee5d61a16c1a00ae4864a632aba2c297faa81c3.tar nixpkgs-9ee5d61a16c1a00ae4864a632aba2c297faa81c3.tar.gz nixpkgs-9ee5d61a16c1a00ae4864a632aba2c297faa81c3.tar.bz2 nixpkgs-9ee5d61a16c1a00ae4864a632aba2c297faa81c3.tar.lz nixpkgs-9ee5d61a16c1a00ae4864a632aba2c297faa81c3.tar.xz nixpkgs-9ee5d61a16c1a00ae4864a632aba2c297faa81c3.tar.zst nixpkgs-9ee5d61a16c1a00ae4864a632aba2c297faa81c3.zip |
nixos: Installer tests for systemd stage 1
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
-rw-r--r-- | nixos/tests/installer-systemd-stage-1.nix | 33 | ||||
-rw-r--r-- | nixos/tests/installer.nix | 7 |
3 files changed, 40 insertions, 1 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cb68ef68530..f75ff1d0232 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -232,6 +232,7 @@ in input-remapper = handleTest ./input-remapper.nix {}; inspircd = handleTest ./inspircd.nix {}; installer = handleTest ./installer.nix {}; + installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix {}; invoiceplane = handleTest ./invoiceplane.nix {}; iodine = handleTest ./iodine.nix {}; ipfs = handleTest ./ipfs.nix {}; diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix new file mode 100644 index 00000000000..a8b418626e6 --- /dev/null +++ b/nixos/tests/installer-systemd-stage-1.nix @@ -0,0 +1,33 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +}: + +{ + # Some of these tests don't work with systemd stage 1 yet. Uncomment + # them when fixed. + inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; }) + # bcache + # btrfsSimple + # btrfsSubvolDefault + # btrfsSubvols + # encryptedFSWithKeyfile + # grub1 + # luksroot + # luksroot-format1 + # luksroot-format2 + # lvm + separateBoot + separateBootFat + simple + simpleLabels + simpleProvided + simpleSpecialised + simpleUefiGrub + simpleUefiGrubSpecialisation + simpleUefiSystemdBoot + # swraid + # zfsroot + ; + +} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 30a5b5c45b3..e040584bdb6 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -1,6 +1,7 @@ { system ? builtins.currentSystem, config ? {}, - pkgs ? import ../.. { inherit system config; } + pkgs ? import ../.. { inherit system config; }, + systemdStage1 ? false }: with import ../lib/testing-python.nix { inherit system pkgs; }; @@ -23,6 +24,8 @@ let # To ensure that we can rebuild the grub configuration on the nixos-rebuild system.extraDependencies = with pkgs; [ stdenvNoCC ]; + ${optionalString systemdStage1 "boot.initrd.systemd.enable = true;"} + ${optionalString (bootLoader == "grub") '' boot.loader.grub.version = ${toString grubVersion}; ${optionalString (grubVersion == 1) '' @@ -290,6 +293,8 @@ let virtualisation.cores = 8; virtualisation.memorySize = 1536; + boot.initrd.systemd.enable = systemdStage1; + # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is # the same during and after installation. |