From 1be9207d91f1f3df02161356f0057c24b6a230c3 Mon Sep 17 00:00:00 2001
From: Dan Kenigsberg <danken@redhat.com>
Date: Tue, 19 Jun 2012 00:52:25 +0300
Subject: [PATCH 20/25] deployUtil: use os.uname instead of /bin/uname
simpler, quicker, and less error-prone.
Change-Id: I7abc1f010bbf15b39d7590c4b55d1835c645a87f
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/5636
Tested-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Reviewed-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/5749
---
configure.ac | 1 -
vdsm_reg/deployUtil.py.in | 11 ++---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index f3a609f..7b829f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,6 @@ AC_PATH_PROG([TC_PATH], [tc], [/sbin/tc])
AC_PATH_PROG([TUNE2FS_PATH], [tune2fs], [/sbin/tune2fs])
AC_PATH_PROG([UDEVADM_PATH], [udevadm], [/sbin/udevadm])
AC_PATH_PROG([UMOUNT_PATH], [umount], [/bin/umount])
-AC_PATH_PROG([UNAME_PATH], [uname], [/bin/uname])
AC_PATH_PROG([UNPERSIST_PATH], [unpersist], [/usr/sbin/unpersist])
AC_PATH_PROG([VCONFIG_PATH], [vconfig], [/sbin/vconfig])
AC_PATH_PROG([WGET_PATH], [wget], [/usr/bin/wget])
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index 2f240cc..7586aca 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -72,7 +72,6 @@ EX_RPM = '@RPM_PATH@'
EX_SED = '@SED_PATH@'
EX_SERVICE = '@SERVICE_PATH@'
EX_SYSTEMCTL = '@SYSTEMCTL_PATH@'
-EX_UNAME = '@UNAME_PATH@'
EX_YUM = '@YUM_PATH@'
# Other constants
@@ -400,15 +399,9 @@ def getOSVersion():
return "Unknown OS"
def getKernelVersion():
- """
- Return current kernel release.
- """
- strReturn = '0'
- out, err, rc = _logExec([EX_UNAME, "-r"])
- if not rc:
- strReturn = out
+ """Return current kernel version adn release."""
- return strReturn
+ return os.uname()[2]
def updateKernelArgs(arg):
"""
--
1.7.10.2