diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-08-24 13:42:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 13:42:11 +0100 |
| commit | 4c9ad3ca793e2418a725f2c227108b71db109913 (patch) | |
| tree | 3dfb818a33da2cf65515970586a1723cb8792cb3 /nixos/tests/zfs.nix | |
| parent | 5c70c5eeaa275aae90e1d3e5b63a6fdcf29bc850 (diff) | |
| parent | e207de63f4f4a8f377eed1f522dc872f338eb26c (diff) | |
| download | nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.gz nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.bz2 nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.lz nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.xz nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.tar.zst nixpkgs-4c9ad3ca793e2418a725f2c227108b71db109913.zip | |
Merge branch 'master' into nginx-update
Diffstat (limited to 'nixos/tests/zfs.nix')
| -rw-r--r-- | nixos/tests/zfs.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 7ba60ee9806..87e6c900c98 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -46,6 +46,17 @@ let "zpool destroy rpool", "udevadm settle", ) + + machine.succeed( + 'echo password | zpool create -o altroot="/tmp/mnt" ' + + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1", + "zfs create -o mountpoint=legacy rpool/root", + "mount -t zfs rpool/root /tmp/mnt", + "udevadm settle", + "umount /tmp/mnt", + "zpool destroy rpool", + "udevadm settle", + ) '' + extraTest; }; @@ -57,18 +68,6 @@ in { unstable = makeZfsTest "unstable" { enableUnstable = true; - extraTest = '' - machine.succeed( - 'echo password | zpool create -o altroot="/tmp/mnt" ' - + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1", - "zfs create -o mountpoint=legacy rpool/root", - "mount -t zfs rpool/root /tmp/mnt", - "udevadm settle", - "umount /tmp/mnt", - "zpool destroy rpool", - "udevadm settle", - ) - ''; }; installer = (import ./installer.nix { }).zfsroot; |