diff options
| author | Linus Heckemann <git@sphalerite.org> | 2023-10-02 11:35:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 11:35:16 +0200 |
| commit | 313d0245a80a46c217c8b1ca91f097f921a28467 (patch) | |
| tree | 02f61a69585a29cb86f00e5b38d21a765f40d7bf /nixos/tests | |
| parent | 4c969d6925c720369fda56dbab14b708170dab73 (diff) | |
| parent | f6f5f60879c8bee472d37d79b53757a47098b446 (diff) | |
Merge pull request #256666 from lheckemann/bcachefs-keyring
bcachefs tests: unlock directly to the right keyring
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/bcachefs.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 0385e098997f4..ec3c2427f386d 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -20,9 +20,8 @@ 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", - "keyctl link @u @s", "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", - "echo password | bcachefs unlock /dev/vdb1", + "echo password | bcachefs unlock -k session /dev/vdb1", "echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 56ba85b76e6f5..3268a16967d75 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -931,9 +931,8 @@ in { "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", - "keyctl link @u @s", "echo password | mkfs.bcachefs -L root --encrypted /dev/vda3", - "echo password | bcachefs unlock /dev/vda3", + "echo password | bcachefs unlock -k session /dev/vda3", "echo password | mount -t bcachefs /dev/vda3 /mnt", "mkfs.ext3 -L boot /dev/vda1", "mkdir -p /mnt/boot", |