diff options
| author | Sergey Lukjanov <me@slukjanov.name> | 2020-02-19 11:38:15 -0800 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-16 10:36:48 +0000 |
| commit | da4e029edf18d3cf73dd1c6c215573ecad2a6187 (patch) | |
| tree | 95cbd9eac74d32d07b4095d5e9f765d56934428d /nixos/tests/zfs.nix | |
| parent | 8f1de2e7c091acaf636e23ad02b335bdd4305bfc (diff) | |
| download | nixpkgs-da4e029edf18d3cf73dd1c6c215573ecad2a6187.tar nixpkgs-da4e029edf18d3cf73dd1c6c215573ecad2a6187.tar.gz nixpkgs-da4e029edf18d3cf73dd1c6c215573ecad2a6187.tar.bz2 nixpkgs-da4e029edf18d3cf73dd1c6c215573ecad2a6187.tar.lz nixpkgs-da4e029edf18d3cf73dd1c6c215573ecad2a6187.tar.xz nixpkgs-da4e029edf18d3cf73dd1c6c215573ecad2a6187.tar.zst nixpkgs-da4e029edf18d3cf73dd1c6c215573ecad2a6187.zip | |
nixos/zfs: enable encryption test for stable zfs
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; |