[node-patches] Change in ovirt-node[ovirt-3.6]: Revert "ovirtfunctions: Fix mount_liveos"

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: Revert "ovirtfunctions: Fix mount_liveos"
......................................................................

Revert "ovirtfunctions: Fix mount_liveos"

This reverts commit 1200e17fff94c0a88a224e889cfdd9a639ed36e6.

Change-Id: I750208c061234480fd9a358e663518c265f83f9e
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirtnode/ovirtfunctions.py
1 file changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/04/46104/1

diff --git a/src/ovirtnode/ovirtfunctions.py b/src/ovirtnode/ovirtfunctions.py
index aec1577..d152bc1 100644
--- a/src/ovirtnode/ovirtfunctions.py
+++ b/src/ovirtnode/ovirtfunctions.py
@@ -530,14 +530,15 @@
                     system("ln -s \"/dev/mapper/" + dev + "\" /dev/disk/by-label/Root")
                     if system("mount LABEL=Root /liveos"):
                         return True
-        if os.path.ismount("/dev/.initramfs/live"):
-            if system_closefds("mount -o bind /dev/.initramfs/live /liveos"):
-                return True
-        elif os.path.ismount("/run/initramfs/live"):
-            if system_closefds("mount -o bind /run/initramfs/live /liveos"):
-                return True
-
-        return False
+                    else:
+                        if os.path.ismount("/dev/.initramfs/live"):
+                            system_closefds("mount -o bind /dev/.initramfs/live /liveos")
+                        elif os.path.ismount("/run/initramfs/live"):
+                            system_closefds("mount -o bind /run/initramfs/live /liveos")
+                        else:
+                            return False
+        else:
+            return True
 
 def mount_efi(target="/liveos/efi"):
     # Moved to the new codebase


-- 
To view, visit https://gerrit.ovirt.org/46104
To unsubscribe, visit https://gerrit.ovirt.org/settings

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