[node-patches] Change in ovirt-node[master]: enhance cpe-name logic

[mburns at redhat.com]

Michael Burns has uploaded a new change for review.

Change subject: enhance cpe-name logic
......................................................................

enhance cpe-name logic

determine it based on $VERSION in version.ks
Add ability to specify *type* of hypervisor

Format will be like :

cpe:/o:redhat:enterprise_linux:6:update5:hypervisor${TYPE}

Bug-Url:  https://bugzilla.redhat.com/988683
Bug-Url:  https://bugzilla.redhat.com/961331
Change-Id: Ie7c3c2e9ea9e147b0051e01543bcd8cdbc7b133c
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M recipe/rhevh6-post.ks
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/33/17333/1

diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks
index 17b5f5c..f358891 100644
--- a/recipe/rhevh6-post.ks
+++ b/recipe/rhevh6-post.ks
@@ -1,3 +1,5 @@
+%include version.ks
+
 # add RHEV-H rwtab locations
 mkdir -p /rhev
 cat > /etc/rwtab.d/rhev << EOF_RWTAB_RHEVH
@@ -16,8 +18,10 @@
 chmod +x /usr/bin/lsb_release
 
 # CPE name rhbz#593463
+MAJORVER=${VERSION%%.*}
+MINORVER=${VERSION##*.}
 cat > /etc/system-release-cpe <<\EOF_CPE
-cpe:/o:redhat:enterprise_linux:6:update2:hypervisor
+cpe:/o:redhat:enterprise_linux:${MAJORVER}:update${MINORVER}:hypervisor${TYPE}
 EOF_CPE
 
 echo "Configuring SELinux"


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7c3c2e9ea9e147b0051e01543bcd8cdbc7b133c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Michael Burns <mburns at redhat.com>