[node-patches] Change in ovirt-node[master]: install.py: determine the kernel using uname -r

[dougsland at redhat.com]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: install.py: determine the kernel using uname -r
......................................................................

install.py: determine the kernel using uname -r

There is a scenario where users might install external
kernel modules with edit-node so instead of raise
in case there are two or more kernels available in /lib/module
use the kernel the rhev-h image is running to update initramfs.

Change-Id: I7787a9e3e6bc0b6c5ca7a257f8668a599357cd79
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1330632
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirtnode/install.py
1 file changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/31/56831/1

diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index f92912b..97350be 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -743,12 +743,7 @@
             for path in ["etc", "dev", "proc", "sys", "tmp", "run", "var/tmp"]:
                 mnts += [rbind(path)]
 
-            upd_kver = str(_functions.passthrough("ls -1 %s/lib/modules" % updfs)).strip()
-
-            if len(upd_kver.splitlines()) != 1:
-                # It would be very unusual to see more than one kver directory
-                # in /lib/modules, because our images just contain one kernel
-                raise RuntimeError("Found more than one kernel version")
+            upd_kver = str(_functions.passthrough("uname -r")).strip()
 
             # Update initramfs to pickup multipath wwids
             # Let /boot point to the filesystem on the update candidate partition


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7787a9e3e6bc0b6c5ca7a257f8668a599357cd79
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>