[node-patches] Change in ovirt-node[ovirt-3.5]: installer: Only add mapth.wwid once

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: installer: Only add mapth.wwid once
......................................................................

installer: Only add mapth.wwid once

Previously we added another mpath.wwid argument on updates, this
confused multipath and broke the boot.

Change-Id: I5dbe05082b62a5ec39f14755e377679f45e7966f
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1176058
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirtnode/install.py
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/61/36561/1

diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index abf9849..25cbd9e 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -561,10 +561,10 @@
                                                             "rd_NO_MULTIPATH",
                                                             "")
 
-        with open("/etc/system-release-cpe", "r") as src:
-            is_el7 = ":7:" in src.read()
-        if is_el7 and self.disk and self.disk.startswith("/dev/mapper"):
-            """On el7 we need to specify the wwid of the root device, if it
+        is_mpath_root = self.disk and self.disk.startswith("/dev/mapper")
+        has_mpath_wwid = "mpath.wwid=" in self.bootparams
+        if is_mpath_root and not has_mpath_wwid:
+            """We need to specify the wwid of the root device, if it
             is using multiple paths, to prevent races within dracut.
             Basically there are two options:
             1. bake wwid of root device into initrd


-- 
To view, visit http://gerrit.ovirt.org/36561
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dbe05082b62a5ec39f14755e377679f45e7966f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>