avoid initrd race condition

2 files changed, 4 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()
   openvt -c 13 sh
 
   mkfifo "$MENUFIFO"
-  samizdat_install_udev_rules
 
   if [ "$nbdroot" ]; then
       my_configure_networking
@@ -67,9 +66,11 @@ wait_for_gnupghome_tar()
 
 samizdat_install_udev_rules()
 {
+  local target=/etc/udev/rules.d/z00_blockdev_mountroot.rules
+  [ -e "$target" ] && return
   mkdir -p /etc/udev/rules.d
   echo 'ACTION=="add", SUBSYSTEM=="block", RUN+="/bin/grok-block $env{DEVNAME}"' \
-    > /etc/udev/rules.d/z00_blockdev_mountroot.rules
+    > "$target"
 
   # 'udevadm trigger --action=add' does not work here; need to restard udevd
   # first. not sure why
diff --git a/src/initrd/common.sh b/src/initrd/common.sh
index 5c8ece3..c38fb77 100644
--- a/src/initrd/common.sh
+++ b/src/initrd/common.sh
@@ -47,6 +47,7 @@ bootmenu()
   if [ $? != 0 -a ! "$no_panic" ]; then
     panic "error loading boot menu!  the system won't be usable :("
   fi
+  samizdat_install_udev_rules
   if [ "$do_trigger" ]; then
     force_grok_block
   fi