From 2ac0841d6fcb577cb485140d70f5b5355a45b85a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 04:23:16 +0200 Subject: Merging upstream version 252.26. Signed-off-by: Daniel Baumann --- test/units/testsuite-64.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/units/testsuite-64.sh') diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh index e9f352c..f0cfce3 100755 --- a/test/units/testsuite-64.sh +++ b/test/units/testsuite-64.sh @@ -577,9 +577,10 @@ EOF for ((i = 0; i < ${#devices[@]}; i++)); do # Intentionally use weaker cipher-related settings, since we don't care # about security here as it's a throwaway LUKS partition - cryptsetup luksFormat -q \ - --use-urandom --pbkdf pbkdf2 --pbkdf-force-iterations 1000 \ - --uuid "deadbeef-dead-dead-beef-11111111111$i" --label "encdisk$i" "${devices[$i]}" /etc/btrfs_keyfile + udevadm lock --device="${devices[$i]}" \ + cryptsetup luksFormat -q \ + --use-urandom --pbkdf pbkdf2 --pbkdf-force-iterations 1000 \ + --uuid "deadbeef-dead-dead-beef-11111111111$i" --label "encdisk$i" "${devices[$i]}" /etc/btrfs_keyfile udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/deadbeef-dead-dead-beef-11111111111$i" "/dev/disk/by-label/encdisk$i" # Add the device into /etc/crypttab, reload systemd, and then activate # the device so we can create a filesystem on it later -- cgit v1.2.3