diff options
| author | misuzu <bakalolka@gmail.com> | 2023-10-23 21:20:10 +0300 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2023-10-24 13:43:21 +0200 |
| commit | b8a547d38b87fc0fa6a27d235f44b476bb3dd00c (patch) | |
| tree | be4951514810a22d4acf0a333f40f1973fa7fe51 /nixos/tests/installer.nix | |
| parent | 858c6b9329d7c158f80ea30743fe948005d7e008 (diff) | |
nixos/tests/installer: add postInstallCommands to makeInstallerTest
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 5111cedf9256d..b0e7058510391 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -69,8 +69,8 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi - , grubIdentifier, preBootCommands, postBootCommands, extraConfig + testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi, grubIdentifier + , postInstallCommands, preBootCommands, postBootCommands, extraConfig , testSpecialisationConfig, testFlakeSwitch }: let iface = "virtio"; @@ -153,6 +153,8 @@ let """ ) + ${postInstallCommands} + with subtest("Shutdown system after installation"): machine.succeed("umount -R /mnt") machine.succeed("sync") @@ -368,7 +370,9 @@ let makeInstallerTest = name: - { createPartitions, preBootCommands ? "", postBootCommands ? "", extraConfig ? "" + { createPartitions + , postInstallCommands ? "", preBootCommands ? "", postBootCommands ? "" + , extraConfig ? "" , extraInstallerConfig ? {} , bootLoader ? "grub" # either "grub" or "systemd-boot" , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false @@ -479,7 +483,7 @@ let }; testScript = testScriptFun { - inherit bootLoader createPartitions preBootCommands postBootCommands + inherit bootLoader createPartitions postInstallCommands preBootCommands postBootCommands grubDevice grubIdentifier grubUseEfi extraConfig testSpecialisationConfig testFlakeSwitch; }; |