[node-patches] Change in ovirt-node[master]: rhevh6-post.ks: only includes virt-who for rhevh

dougsland at redhat.com dougsland at redhat.com
Tue Jul 15 17:00:12 UTC 2014


Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhevh6-post.ks: only includes virt-who for rhevh
......................................................................

rhevh6-post.ks: only includes virt-who for rhevh

ovirt-node uses rhevh6-post.ks as base to build the iso image.
As virt-who is only used in rhevh distro we shouldn't ship it for
non rhevh images.

Change-Id: I4dd2ff87bd7242572cddc2a83da10b0070bb27f4
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M recipe/rhevh6-post.ks
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/19/30119/1

diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks
index d943575..afd47b4 100644
--- a/recipe/rhevh6-post.ks
+++ b/recipe/rhevh6-post.ks
@@ -145,10 +145,12 @@
 EOF_start_udev
 
 # rhbz#734478 add virt-who (*.py are removed in rhevh image)
-cat > /usr/bin/virt-who <<EOF_virt_who
-#!/bin/sh
-exec /usr/bin/python /usr/share/virt-who/virt-who.pyc "\$@"
+if [ -f /etc/rhev-hypervisor-release ]; then
+    cat > /usr/bin/virt-who <<EOF_virt_who
+    #!/bin/sh
+    exec /usr/bin/python /usr/share/virt-who/virt-who.pyc "\$@"
 EOF_virt_who
+fi
 
 # set maxlogins to 3
 echo "*        -       maxlogins      3" >> /etc/security/limits.conf


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

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



More information about the node-patches mailing list