Unverified Commit 313d0245 authored by Linus Heckemann's avatar Linus Heckemann Committed by GitHub
Browse files

Merge pull request #256666 from lheckemann/bcachefs-keyring 

bcachefs tests: unlock directly to the right keyring
parents 4c969d69 f6f5f608

nixos/tests/bcachefs.nix

+1 −2
Original line number Diff line number Diff line
@@ -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",

nixos/tests/installer.nix

+1 −2
Original line number Diff line number Diff line
@@ -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",