mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
test: lock device during running cryptsetup
On running cryptsetup, udevd detects two inotify events for the underlying device. Running the test on enough fast host, the expected symlinks based on UUID and disk label are created by the second event. During processing a uevent for a device, udevd disables the inotify watch for the device. If the test runs on slow system, the second inotify event may comes during a udev worker processing the synthesized uevent triggered by the first inotify event. Hence, no synthesized uevent for the second inotify event will be generated, and the expected symlinks will be never created. To prevent the issue, we need to lock the device during cryptsetup command is running. Fixes #32913.
This commit is contained in:
parent
bb6ce6b6a4
commit
be43c9b029
|
@ -787,9 +787,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
|
||||
|
|
Loading…
Reference in a new issue