kill udev before switch_root and bail out after 10 seconds of mount tries

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 74b3368cc84ae4423c5f641c42235a122cadbd28..1d28cb0eb9d902e09eb8e935a52198c5e825d7e2 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -64,6 +64,7 @@ source_all pre-mount
 getarg 'break=mount' && emergency_shell
 # mount scripts actually try to mount the root filesystem, and may
 # be sourced any number of times. As soon as one suceeds, no more are sourced.
+i=0
 while :; do
     for f in /mount/*.sh; do
        [ -x "$f" ] && . "$f";
@@ -71,6 +72,8 @@ while :; do
     done
     [ "$ROOTFS_MOUNTED" ] && break;
     sleep 1
+    i=$[$i+1]
+    [ $i -gt 10 ] && emergency_shell
 done
 
 # by the time we get here, the root filesystem should be mounted.
@@ -88,6 +91,7 @@ done
 getarg 'break=pre-pivot' && emergency_shell
 source_all pre-pivot
 getarg break && emergency_shell
+kill $(pidof udevd)
 echo "Switching to real root filesystem $root"
 exec switch_root "$NEWROOT" "$INIT"  $CMDLINE || {
     # davej doesn't like initrd bugs