[node-patches] Change in ovirt-node[ovirt-3.5]: Updating REDHAT_BUGZILLA_PRODUCT field in /etc/os-release fo...

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: Updating REDHAT_BUGZILLA_PRODUCT field in /etc/os-release for plymouth
......................................................................

Updating REDHAT_BUGZILLA_PRODUCT field in /etc/os-release for plymouth

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1181987
Change-Id: I5adb347b34a4108bec90ea20e60f0c6fc2c6f526
Signed-off-by: Tolik Litovsky <tlitovsk at redhat.com>
(cherry picked from commit 20405c59994ad69300e81bd9d3e2794dfe6187fb)
---
M recipe/common-nochroot.ks
1 file changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/05/36905/1

diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks
index f2ab496..25e7b22 100644
--- a/recipe/common-nochroot.ks
+++ b/recipe/common-nochroot.ks
@@ -33,9 +33,9 @@
 }
 linux0==1 && $1=="label" && $2!="linux0" {
   linux0=2
-  print "label install (basic video)"     
-  print " menu label Install (Basic Video)"       
-  print " kernel vmlinuz0"        
+  print "label install (basic video)"
+  print " menu label Install (Basic Video)"
+  print " kernel vmlinuz0"
   print append0" nomodeset "
   print "label serial-console"
   print "  menu label Install or Upgrade with serial console"
@@ -45,9 +45,9 @@
   print "  menu label Reinstall"
   print "  kernel vmlinuz0"
   print append0" reinstall "
-  print "label reinstall (basic video)"       
-  print " menu label Reinstall (Basic Video)"     
-  print " kernel vmlinuz0"        
+  print "label reinstall (basic video)"
+  print " menu label Reinstall (Basic Video)"
+  print " kernel vmlinuz0"
   print append0" reinstall nomodeset "
   print "label reinstall-serial"
   print "  menu label Reinstall with serial console"
@@ -98,6 +98,8 @@
 cp $INSTALL_ROOT/etc/issue $INSTALL_ROOT/etc/issue.net
 
 # Also update os-release, this is where ply 7.0 is taking the name from
+# we should update both since both can be used
+sed -i "/^REDHAT_BUGZILLA_PRODUCT=/ s/.*/REDHAT_BUGZILLA_PRODUCT=\"$PRODUCT release $VERSION\"/" $INSTALL_ROOT/etc/os-release
 sed -i "/^PRETTY_NAME/ s/.*/PRETTY_NAME=\"$PRODUCT release $VERSION\"/" $INSTALL_ROOT/etc/os-release
 
 NAME=$(grep CDLABEL $LIVE_ROOT/isolinux/isolinux.cfg |head -n1|sed -r 's/^.*CDLABEL\=([a-zA-Z0-9_\.-]+) .*$/\1/g')


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5adb347b34a4108bec90ea20e60f0c6fc2c6f526
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Anatoly Litovsky <tlitovsk at redhat.com>