[node-patches] Change in ovirt-node[master]: fix: Rebase fixes

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: fix: Rebase fixes
......................................................................

fix: Rebase fixes

A couple of things missed during the last big patch-queue merge.

Change-Id: Ib36401c93f085b1316fc80ee8dc91639bf1d174b
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/utils/system.py
1 file changed, 1 insertion(+), 23 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/58/15858/1

diff --git a/src/ovirt/node/utils/system.py b/src/ovirt/node/utils/system.py
index 2b0c1f9..0546df6 100644
--- a/src/ovirt/node/utils/system.py
+++ b/src/ovirt/node/utils/system.py
@@ -88,7 +88,7 @@
     return ret
 
 
-def service(name, cmd, check=True):
+def service(name, cmd, do_raise=True):
     """Convenience wrapper to handle service interactions
     """
     try:
@@ -263,28 +263,6 @@
 
     def get_current(self):
         return self.kbd.get()
-
-
-class BootInformation(base.Base):
-    """Provide informations about this boot
-    """
-    def __init__(self):
-        self._model = defaults.Installation()
-        super(BootInformation, self).__init__()
-
-    def is_installation(self):
-        #ovirtfunctions.is_install()
-        return self._model.retrieve()["install"] is True
-
-    def is_auto_installation(self):
-        #ovirtfunctions.is_auto_install()
-        cmdline = utils.fs.get_contents("/proc/cmdline")
-        return "BOOTIF" in cmdline and ("storage_init" in cmdline or
-                                        "ovirt_init" in cmdline)
-
-    def is_upgrade(self):
-        #ovirtfunctions.is_upgrade()
-        return self._model.retrieve()["upgrade"] is True
 
 
 class Reboot(base.Base):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib36401c93f085b1316fc80ee8dc91639bf1d174b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>