summaryrefslogtreecommitdiff
path: root/initramfs-tools
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2019-10-16 23:45:46 -0400
committerAndrew Cady <d@jerkface.net>2019-10-16 23:45:46 -0400
commit6d61f1279978db9a36a4df39bb208b078e89c2b8 (patch)
treeb11ebf20a736a42741d9a2b560261570bf1a8e9d /initramfs-tools
parent26490c0022666a01b031036ead74ce85d3f71557 (diff)
avoid initrd race condition
Diffstat (limited to 'initramfs-tools')
-rw-r--r--initramfs-tools/scripts/samizdat5
1 files changed, 3 insertions, 2 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 850a855..4658278 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -20,7 +20,6 @@ mountroot()
20 openvt -c 13 sh 20 openvt -c 13 sh
21 21
22 mkfifo "$MENUFIFO" 22 mkfifo "$MENUFIFO"
23 samizdat_install_udev_rules
24 23
25 if [ "$nbdroot" ]; then 24 if [ "$nbdroot" ]; then
26 my_configure_networking 25 my_configure_networking
@@ -67,9 +66,11 @@ wait_for_gnupghome_tar()
67 66
68samizdat_install_udev_rules() 67samizdat_install_udev_rules()
69{ 68{
69 local target=/etc/udev/rules.d/z00_blockdev_mountroot.rules
70 [ -e "$target" ] && return
70 mkdir -p /etc/udev/rules.d 71 mkdir -p /etc/udev/rules.d
71 echo 'ACTION=="add", SUBSYSTEM=="block", RUN+="/bin/grok-block $env{DEVNAME}"' \ 72 echo 'ACTION=="add", SUBSYSTEM=="block", RUN+="/bin/grok-block $env{DEVNAME}"' \
72 > /etc/udev/rules.d/z00_blockdev_mountroot.rules 73 > "$target"
73 74
74 # 'udevadm trigger --action=add' does not work here; need to restard udevd 75 # 'udevadm trigger --action=add' does not work here; need to restard udevd
75 # first. not sure why 76 # first. not sure why