[node-patches] Change in ovirt-node[master]: Hooks should work in ovirt-node-upgrade

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Hooks should work in ovirt-node-upgrade
......................................................................

Hooks should work in ovirt-node-upgrade

os.path.join() discards previous entries if one starts with /.
Previously, ovirt-node-upgrade tried to run all hooks from the
running image and not the one being upgraded to. It should run
from the chroot instead.

Change-Id: I0627d89165002a33ea060b4be2bc03282854bcc3
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M scripts/ovirt-node-upgrade.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/85/23285/1

diff --git a/scripts/ovirt-node-upgrade.py b/scripts/ovirt-node-upgrade.py
index 2712c79..a818b9f 100755
--- a/scripts/ovirt-node-upgrade.py
+++ b/scripts/ovirt-node-upgrade.py
@@ -130,7 +130,7 @@
             "LiveOS",
             "ext3fs.img",
         )
-        self._hooks_path = "/usr/libexec/ovirt-node/hooks/"
+        self._hooks_path = "usr/libexec/ovirt-node/hooks/"
         self._logger.info("Temporary Directory is: %s", self._tmp_dir)
 
     def _system(self, *command):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0627d89165002a33ea060b4be2bc03282854bcc3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>