[node-patches] Change in ovirt-node[master]: install: Make find Boot disk a bit more strict

[hadong0720 at gmail.com]

hadong has uploaded a new change for review.

Change subject: install:  Make find Boot disk a bit more strict
......................................................................

install:  Make find Boot disk a bit more strict

Change-Id: Ica272049fdbe3298f4dd8503239c5f64f3687b0a
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=885959
Signed-off-by: hadong <hadong0720 at gmail.com>
---
M src/ovirtnode/install.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/38/20238/1

diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index 07ae13c..0cc60c6 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -100,7 +100,11 @@
 
     def grub_install(self):
         if _functions.is_iscsi_install():
-            self.disk = re.sub("p[1,2,3]$", "", _functions.findfs(self.boot_candidate))
+            self.disk = _functions.findfs("BootNew")
+            if not "/dev/mapper/" in self.disk:
+                self.disk = self.disk[:-1]
+            else:
+                self.disk = re.sub("p[1,2,3]$", "", self.disk)
         device_map = "(hd0) %s" % self.disk
         logger.debug(device_map)
         device_map_conf = open(self.grub_dir + "/device.map", "w")


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica272049fdbe3298f4dd8503239c5f64f3687b0a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: hadong <hadong0720 at gmail.com>