mirror of
https://github.com/dracutdevs/dracut.git
synced 2024-10-27 00:55:34 +03:00
crypt: Wait for udev to settle before unlocking disk
To eliminate a race condition that occurs when unlocking one device depends on the result of unlocking a device before it, the crypt module must wait for udev to settle between each unlock attempt. Example /etc/crypttab: keyfile /dev/md1 none luks sda4_crypt /dev/sda4 /dev/mapper/keyfile luks sdb4_crypt /dev/sdb4 /dev/mapper/keyfile luks Without this patch, sometimes /dev/sda4 fails to unlock because udev doesn't have time to create /dev/mapper/keyfile before it's needed.
This commit is contained in:
parent
27458b10ff
commit
6e0348f33b
@ -23,7 +23,7 @@ else
|
|||||||
{
|
{
|
||||||
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
|
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
|
||||||
printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
|
printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
|
||||||
printf -- 'RUN+="%s --unique --onetime ' $(command -v initqueue)
|
printf -- 'RUN+="%s --settled --unique --onetime ' $(command -v initqueue)
|
||||||
printf -- '--name cryptroot-ask-%%k %s ' $(command -v cryptroot-ask)
|
printf -- '--name cryptroot-ask-%%k %s ' $(command -v cryptroot-ask)
|
||||||
printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
|
printf -- '$env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $tout
|
||||||
} >> /etc/udev/rules.d/70-luks.rules.new
|
} >> /etc/udev/rules.d/70-luks.rules.new
|
||||||
@ -31,7 +31,7 @@ else
|
|||||||
{
|
{
|
||||||
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
|
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
|
||||||
printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
|
printf -- 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
|
||||||
printf -- 'RUN+="%s --unique --onetime ' $(command -v initqueue)
|
printf -- 'RUN+="%s --settled --unique --onetime ' $(command -v initqueue)
|
||||||
printf -- '--name systemd-cryptsetup-%%k %s start ' $(command -v systemctl)
|
printf -- '--name systemd-cryptsetup-%%k %s start ' $(command -v systemctl)
|
||||||
printf -- 'systemd-cryptsetup@luks$$(dev_unit_name -$env{ID_FS_UUID}).service"\n'
|
printf -- 'systemd-cryptsetup@luks$$(dev_unit_name -$env{ID_FS_UUID}).service"\n'
|
||||||
} >> /etc/udev/rules.d/70-luks.rules.new
|
} >> /etc/udev/rules.d/70-luks.rules.new
|
||||||
@ -51,13 +51,13 @@ else
|
|||||||
if [ -z "$DRACUT_SYSTEMD" ]; then
|
if [ -z "$DRACUT_SYSTEMD" ]; then
|
||||||
{
|
{
|
||||||
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' $(command -v initqueue)
|
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' $(command -v initqueue)
|
||||||
printf -- '--unique --onetime --name cryptroot-ask-%%k '
|
printf -- '--unique --settled --onetime --name cryptroot-ask-%%k '
|
||||||
printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $(command -v cryptroot-ask) $tout
|
printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' $(command -v cryptroot-ask) $tout
|
||||||
} >> /etc/udev/rules.d/70-luks.rules.new
|
} >> /etc/udev/rules.d/70-luks.rules.new
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' $(command -v initqueue)
|
printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' $(command -v initqueue)
|
||||||
printf -- '--unique --onetime --name crypt-run-generator-%%k '
|
printf -- '--unique --settled --onetime --name crypt-run-generator-%%k '
|
||||||
printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID}"\n' $(command -v crypt-run-generator)
|
printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID}"\n' $(command -v crypt-run-generator)
|
||||||
} >> /etc/udev/rules.d/70-luks.rules.new
|
} >> /etc/udev/rules.d/70-luks.rules.new
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user