diff options
| author | Jamie McClymont <jamie@kwiius.com> | 2022-03-06 18:29:58 +1300 |
|---|---|---|
| committer | Jamie McClymont <jamie@kwiius.com> | 2022-03-14 21:49:24 +1300 |
| commit | 4ee9b84ec5e0367f24fd144d778490d093471d7d (patch) | |
| tree | 8480f908a2d6c6fd0635c430a32f76c5dbaf8552 | |
| parent | 5a8602a87bbbd48a6e05083d07afda56a80d90dc (diff) | |
| download | nixpkgs-4ee9b84ec5e0367f24fd144d778490d093471d7d.tar nixpkgs-4ee9b84ec5e0367f24fd144d778490d093471d7d.tar.gz nixpkgs-4ee9b84ec5e0367f24fd144d778490d093471d7d.tar.bz2 nixpkgs-4ee9b84ec5e0367f24fd144d778490d093471d7d.tar.lz nixpkgs-4ee9b84ec5e0367f24fd144d778490d093471d7d.tar.xz nixpkgs-4ee9b84ec5e0367f24fd144d778490d093471d7d.tar.zst nixpkgs-4ee9b84ec5e0367f24fd144d778490d093471d7d.zip | |
nixos/bcachefs: re-enable encryption in test
| -rw-r--r-- | nixos/tests/bcachefs.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 211195586ed..44997a74687 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; boot.supportedFilesystems = [ "bcachefs" ]; - environment.systemPackages = with pkgs; [ parted ]; + environment.systemPackages = with pkgs; [ parted keyutils ]; }; testScript = '' @@ -20,10 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { "parted --script /dev/vdb mklabel msdos", "parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s", "udevadm settle", - # Due to #32279, we cannot use encryption for this test yet - # "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", - # "echo password | bcachefs unlock /dev/vdb1", - "bcachefs format --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "keyctl link @u @s", + "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "echo password | bcachefs unlock /dev/vdb1", "mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", |