From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 23 Aug 2016 10:56:21 +0000 (+0200)
Subject: Fix warning about multipath if not needed
X-Git-Tag: 047~76^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee6b44342b577164495b57a6655a5a08c764d09b;p=thirdparty%2Fdracut.git

Fix warning about multipath if not needed

Although no device uses multipath, the module checks
for presence of the multipath binary first, printing a
warning if not present. This patch fixes the wrong ordering.
---

diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index 28857ebcd..0a680b177 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -10,13 +10,14 @@ is_mpath() {
 # called by dracut
 check() {
     local _rootdev
-    # if there's no multipath binary, no go.
-    require_binaries multipath || return 1
 
     [[ $hostonly ]] || [[ $mount_needs ]] && {
         for_each_host_dev_and_slaves is_mpath || return 255
     }
 
+    # if there's no multipath binary, no go.
+    require_binaries multipath || return 1
+
     return 0
 }