[node-patches] Change in ovirt-node[master]: revert bad merge in install.py for iscsiroot

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: revert bad merge in install.py for iscsiroot
......................................................................

revert bad merge in install.py for iscsiroot

Change-Id: If18e2a7c874ebe4fced41b02702a6af8f442e84b
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M scripts/ovirtnode/install.py
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/92/8592/1

diff --git a/scripts/ovirtnode/install.py b/scripts/ovirtnode/install.py
index 3ff7d26..ae369a7 100755
--- a/scripts/ovirtnode/install.py
+++ b/scripts/ovirtnode/install.py
@@ -383,15 +383,9 @@
         self.kernel_image_copy()
 
         # reorder tty0 to allow both serial and phys console after installation
-<<<<<<< HEAD:scripts/ovirtnode/install.py
         if _functions.is_iscsi_install():
-            self.root_param = "root=LABEL=Root"
-            self.bootparams = "root=iscsi:%s::%s::%s ip=%s:dhcp" % (
-=======
-        if is_iscsi_install():
             self.root_param = "root=live:LABEL=Root"
             self.bootparams = "netroot=iscsi:%s::%s::%s ip=br%s:dhcp bridge=br%s:%s " % (
->>>>>>> c0fdc03... installer: Finish iscsiroot installation code:scripts/install.py
                 OVIRT_VARS["OVIRT_ISCSI_TARGET_HOST"],
                 OVIRT_VARS["OVIRT_ISCSI_TARGET_PORT"],
                 OVIRT_VARS["OVIRT_ISCSI_TARGET_NAME"],


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If18e2a7c874ebe4fced41b02702a6af8f442e84b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>