[node-patches] Change in ovirt-node[master]: removing the if on virt-who pyc use and triming the /usr/bin...

[tlitovsk at redhat.com]

Anatoly Litovsky has uploaded a new change for review.

Change subject: removing the if on virt-who pyc use and triming the /usr/bin/virt-who
......................................................................

removing the if on virt-who pyc use and triming the /usr/bin/virt-who

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1152947
Change-Id: I0b3603ab32a1d516f48f238de102ea8435233654
Signed-off-by: Tolik Litovsky <tlitovsk at redhat.com>
---
M recipe/rhevh7-post.ks
1 file changed, 12 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/37/35037/1

diff --git a/recipe/rhevh7-post.ks b/recipe/rhevh7-post.ks
index a5c0de7..475a1a3 100644
--- a/recipe/rhevh7-post.ks
+++ b/recipe/rhevh7-post.ks
@@ -163,22 +163,20 @@
 echo "files     /var/lib/nfs" >> /etc/rwtab
 
 # rhbz#734478 add virt-who (*.py are removed in rhevh image)
-if [ -f /etc/rhev-hypervisor-release ]; then
-    cmd_who=""
-    if [ -f /usr/share/virt-who/virt-who.pyc ]; then
-        cmd_who="virt-who.pyc"
-    elif [ -f /usr/share/virt-who/virtwho.pyc ]; then
-        cmd_who="virtwho.pyc"
-    else
-        echo "Couldn't find a known virt-who executable. Please check"
-    fi
+cmd_who=""
+if [ -f /usr/share/virt-who/virt-who.pyc ]; then
+    cmd_who="virt-who.pyc"
+elif [ -f /usr/share/virt-who/virtwho.pyc ]; then
+    cmd_who="virtwho.pyc"
+else
+    echo "Couldn't find a known virt-who executable. Please check"
+fi
 
-    if [ ! -z $cmd_who ]; then
-        cat > /usr/bin/virt-who <<EOF_virt_who
-        #!/bin/sh
-        exec /usr/bin/python /usr/share/virt-who/$cmd_who "\$@"
+if [ ! -z $cmd_who ]; then
+   cat > /usr/bin/virt-who <<EOF_virt_who
+#!/bin/sh
+exec /usr/bin/python /usr/share/virt-who/$cmd_who "\$@"
 EOF_virt_who
-    fi
 fi
 
 # rhbz 1152947 fixing virt-who start dependancy syslog.socket


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b3603ab32a1d516f48f238de102ea8435233654
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Anatoly Litovsky <tlitovsk at redhat.com>