00-fsdev.sh: sleep on multipath -v only if using mdev

11 years ago · 61f704692c
parent b832cf7a95
commit 61f704692c
1 changed files with 4 additions and 2 deletions
--- a/defaults/initrd.d/00-fsdev.sh
+++ b/defaults/initrd.d/00-fsdev.sh
@ -198,8 +198,10 @@ start_volumes() {
    if [ "${USE_MULTIPATH_NORMAL}" = "1" ]; then
        good_msg "Scanning for multipath devices"
        multipath -v 0
-        # TODO(lxnay): horrible sleep!
-        sleep 2
+
+        is_udev && udevadm settle
+        is_mdev && sleep 2
+
        good_msg "Activating multipath devices"
        dmsetup ls --target multipath --exec "/sbin/kpartx -a -v"
    fi