pyrox.dev
Merge pull request #256666 from lheckemann/bcachefs-keyring
bcachefs tests: unlock directly to the right keyring
authored by Linus Heckemann and committed by GitHub 313d0245 4c969d69
+1
-2
nixos/tests/bcachefs.nix
+1
-2
nixos/tests/bcachefs.nix
···
20
"parted --script /dev/vdb mklabel msdos",
21
"parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s",
22
"udevadm settle",
23
-
"keyctl link @u @s",
24
"echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
25
-
"echo password | bcachefs unlock /dev/vdb1",
26
"echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
27
"udevadm settle",
28
"bcachefs fs usage /tmp/mnt",
···
20
"parted --script /dev/vdb mklabel msdos",
21
"parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s",
22
"udevadm settle",
23
"echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
24
+
"echo password | bcachefs unlock -k session /dev/vdb1",
25
"echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
26
"udevadm settle",
27
"bcachefs fs usage /tmp/mnt",
+1
-2
nixos/tests/installer.nix
+1
-2
nixos/tests/installer.nix
···
931
"udevadm settle",
932
"mkswap /dev/vda2 -L swap",
933
"swapon -L swap",
934
-
"keyctl link @u @s",
935
"echo password | mkfs.bcachefs -L root --encrypted /dev/vda3",
936
-
"echo password | bcachefs unlock /dev/vda3",
937
"echo password | mount -t bcachefs /dev/vda3 /mnt",
938
"mkfs.ext3 -L boot /dev/vda1",
939
"mkdir -p /mnt/boot",
···
931
"udevadm settle",
932
"mkswap /dev/vda2 -L swap",
933
"swapon -L swap",
934
"echo password | mkfs.bcachefs -L root --encrypted /dev/vda3",
935
+
"echo password | bcachefs unlock -k session /dev/vda3",
936
"echo password | mount -t bcachefs /dev/vda3 /mnt",
937
"mkfs.ext3 -L boot /dev/vda1",
938
"mkdir -p /mnt/boot",