[NEW PATCH] BZ#735932 vds_bootstrap: read version from /etc/system-release (via gerrit-bot)
Dan Kenigsberg
danken at redhat.com
Thu Sep 8 13:11:03 UTC 2011
New patch submitted by Dan Kenigsberg (danken at redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/916
commit b8709ae2715080c5c9ef365a870a45e8e422e2b5
Author: Dan Kenigsberg <danken at redhat.com>
Date: Thu Sep 8 15:09:31 2011 +0300
BZ#735932 vds_bootstrap: read version from /etc/system-release
Former patch for this bug fails measerably on RHEL hosts.
v2:
- no need to look for /etc/rhev-hypervisor-release even on old RHEV-H.
v3:
- no need to loop at all: /etc/system-release points to the right file.
Change-Id: I02d7734ee38b832038129b7e386fe60aa98011ad
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index 81020bb..c2deac8 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -356,14 +356,9 @@ def getOSVersion():
"""
s = ''
- for f in ('/etc/rhev-hypervisor-release', '/etc/redhat-release',
- '/etc/fedora-release'):
- try:
- s = file(f).read()
- except OSError:
- pass
-
try:
+ s = file('/etc/system-release', 'r').read()
+
return islice(dropwhile(lambda x: x != 'release', s.split()),
1, 2).next()
except:
More information about the vdsm-patches
mailing list