nixos: Installer tests for systemd stage 1
This commit is contained in:
parent
9e8b463cce
commit
9ee5d61a16
4 changed files with 44 additions and 1 deletions
|
@ -99,6 +99,10 @@ with lib;
|
||||||
stdenvNoCC # for runCommand
|
stdenvNoCC # for runCommand
|
||||||
busybox
|
busybox
|
||||||
jq # for closureInfo
|
jq # for closureInfo
|
||||||
|
# For boot.initrd.systemd
|
||||||
|
makeInitrdNGTool
|
||||||
|
systemdStage1
|
||||||
|
systemdStage1Network
|
||||||
];
|
];
|
||||||
|
|
||||||
# Show all debug messages from the kernel but don't log refused packets
|
# Show all debug messages from the kernel but don't log refused packets
|
||||||
|
|
|
@ -232,6 +232,7 @@ in
|
||||||
input-remapper = handleTest ./input-remapper.nix {};
|
input-remapper = handleTest ./input-remapper.nix {};
|
||||||
inspircd = handleTest ./inspircd.nix {};
|
inspircd = handleTest ./inspircd.nix {};
|
||||||
installer = handleTest ./installer.nix {};
|
installer = handleTest ./installer.nix {};
|
||||||
|
installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix {};
|
||||||
invoiceplane = handleTest ./invoiceplane.nix {};
|
invoiceplane = handleTest ./invoiceplane.nix {};
|
||||||
iodine = handleTest ./iodine.nix {};
|
iodine = handleTest ./iodine.nix {};
|
||||||
ipfs = handleTest ./ipfs.nix {};
|
ipfs = handleTest ./ipfs.nix {};
|
||||||
|
|
33
nixos/tests/installer-systemd-stage-1.nix
Normal file
33
nixos/tests/installer-systemd-stage-1.nix
Normal file
|
@ -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
|
||||||
|
;
|
||||||
|
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
{ system ? builtins.currentSystem,
|
{ system ? builtins.currentSystem,
|
||||||
config ? {},
|
config ? {},
|
||||||
pkgs ? import ../.. { inherit system config; }
|
pkgs ? import ../.. { inherit system config; },
|
||||||
|
systemdStage1 ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
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
|
# To ensure that we can rebuild the grub configuration on the nixos-rebuild
|
||||||
system.extraDependencies = with pkgs; [ stdenvNoCC ];
|
system.extraDependencies = with pkgs; [ stdenvNoCC ];
|
||||||
|
|
||||||
|
${optionalString systemdStage1 "boot.initrd.systemd.enable = true;"}
|
||||||
|
|
||||||
${optionalString (bootLoader == "grub") ''
|
${optionalString (bootLoader == "grub") ''
|
||||||
boot.loader.grub.version = ${toString grubVersion};
|
boot.loader.grub.version = ${toString grubVersion};
|
||||||
${optionalString (grubVersion == 1) ''
|
${optionalString (grubVersion == 1) ''
|
||||||
|
@ -290,6 +293,8 @@ let
|
||||||
virtualisation.cores = 8;
|
virtualisation.cores = 8;
|
||||||
virtualisation.memorySize = 1536;
|
virtualisation.memorySize = 1536;
|
||||||
|
|
||||||
|
boot.initrd.systemd.enable = systemdStage1;
|
||||||
|
|
||||||
# Use a small /dev/vdb as the root disk for the
|
# Use a small /dev/vdb as the root disk for the
|
||||||
# installer. This ensures the target disk (/dev/vda) is
|
# installer. This ensures the target disk (/dev/vda) is
|
||||||
# the same during and after installation.
|
# the same during and after installation.
|
||||||
|
|
Loading…
Reference in a new issue