diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-12 09:24:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-12 09:24:00 +0200 |
| commit | 7953a6526938ad25b25bd9216060a9d349ae4653 (patch) | |
| tree | a566a77e8952dc62175ceec3377cbb6368ce8bb8 /nixos/tests | |
| parent | 68c30f0d9b74f61011686bf01796a84b09b0466d (diff) | |
| parent | 7184efb40af0e740000e678a727922a7f58ac597 (diff) | |
| download | nixpkgs-7953a6526938ad25b25bd9216060a9d349ae4653.tar nixpkgs-7953a6526938ad25b25bd9216060a9d349ae4653.tar.gz nixpkgs-7953a6526938ad25b25bd9216060a9d349ae4653.tar.bz2 nixpkgs-7953a6526938ad25b25bd9216060a9d349ae4653.tar.lz nixpkgs-7953a6526938ad25b25bd9216060a9d349ae4653.tar.xz nixpkgs-7953a6526938ad25b25bd9216060a9d349ae4653.tar.zst nixpkgs-7953a6526938ad25b25bd9216060a9d349ae4653.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/installer.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 5e363f5d09e..07659b60b3b 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -273,7 +273,7 @@ let }; }; - makeLuksRootTest = name: luksFormatOpts: makeInstallerTest "luksroot-format2" + makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name { createPartitions = '' $machine->succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" |