[node-patches] Change in ovirt-node[master]:

[tlitovsk at redhat.com]

Anatoly Litovsky has uploaded a new change for review.

Change subject: 
......................................................................

changing the virt-who service start to observe redhat-release file

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1152947
Change-Id: I90ffe9407ff5114570507d57e4ad5c37f7087c62
Signed-off-by: Tolik Litovsky <tlitovsk at redhat.com>
---
M recipe/centos6-post.ks
M recipe/rhevh6-post.ks
M recipe/rhevh7-post.ks
M scripts/ovirt-init-functions.sh.in
4 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/20/35020/1

diff --git a/recipe/centos6-post.ks b/recipe/centos6-post.ks
index 55d1e74..91c8c53 100644
--- a/recipe/centos6-post.ks
+++ b/recipe/centos6-post.ks
@@ -9,7 +9,7 @@
 cat > /usr/bin/lsb_release <<\EOF_LSB
 #!/bin/sh
 if [ "$1" = "-r" ]; then
-    printf "Release:\t$(cat /etc/rhev-hypervisor-release | awk '{print $7}')\n"
+    printf "Release:\t$(cat /etc/redhat-release | awk '{print $7}')\n"
 else
     echo RedHatEnterpriseVirtualizationHypervisor
 fi
diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks
index f35344b..143a8d4 100644
--- a/recipe/rhevh6-post.ks
+++ b/recipe/rhevh6-post.ks
@@ -10,7 +10,7 @@
 cat > /usr/bin/lsb_release <<\EOF_LSB
 #!/bin/sh
 if [ "$1" = "-r" ]; then
-    printf "Release:\t$(cat /etc/rhev-hypervisor-release | awk '{print $7}')\n"
+    printf "Release:\t$(cat /etc/redhat-release | awk '{print $7}')\n"
 else
     echo RedHatEnterpriseVirtualizationHypervisor
 fi
@@ -165,7 +165,7 @@
 EOF_start_udev
 
 # rhbz#734478 add virt-who (*.py are removed in rhevh image)
-if [ -f /etc/rhev-hypervisor-release ]; then
+if [ -f /etc/redhat-release ]; then
     cmd_who=""
     if [ -f /usr/share/virt-who/virt-who.pyc ]; then
         cmd_who="virt-who.pyc"
diff --git a/recipe/rhevh7-post.ks b/recipe/rhevh7-post.ks
index a5c0de7..a5d24e1 100644
--- a/recipe/rhevh7-post.ks
+++ b/recipe/rhevh7-post.ks
@@ -71,7 +71,7 @@
 cat > /usr/bin/lsb_release <<\EOF_LSB
 #!/bin/sh
 if [ "$1" = "-r" ]; then
-    printf "Release:\t$(cat /etc/rhev-hypervisor-release | awk '{print $7}')\n"
+    printf "Release:\t$(cat /etc/redhat-release | awk '{print $7}')\n"
 else
     echo RedHatEnterpriseVirtualizationHypervisor
 fi
@@ -163,7 +163,7 @@
 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
+if [ -f /etc/redhat-release ]; then
     cmd_who=""
     if [ -f /usr/share/virt-who/virt-who.pyc ]; then
         cmd_who="virt-who.pyc"
diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index ce8f570..c8b4fe9 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -1363,7 +1363,7 @@
         swapon -a
         mount -a
 
-        if [ -f /etc/rhev-hypervisor-release ]; then
+        if [ -f /etc/redhat-release ]; then
             # force update rhn profile on boot for upgrades
             rhn_check
         fi


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

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