[node-patches] Change in ovirt-node[master]: Remove superflous release from ply

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: Remove superflous release from ply
......................................................................

Remove superflous release from ply

Change-Id: I7d47ce01d200ce50ab570f82eae0641b3353f7f7
Bur-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1181987#c13
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M recipe/common-nochroot.ks
M recipe/common-post.ks
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/17/37117/1

diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks
index 4b1b166..217848a 100644
--- a/recipe/common-nochroot.ks
+++ b/recipe/common-nochroot.ks
@@ -90,7 +90,7 @@
 # /(which is not shown in ply anyway)
 # The initrd can not be regeneated in a non-chroot env (here)
 cat > $INSTALL_ROOT/etc/$PACKAGE-release <<EOF
-$PRODUCT release $VERSION ($RELEASE)
+$PRODUCT $VERSION ($RELEASE)
 EOF
 ln -snf $PACKAGE-release $INSTALL_ROOT/etc/redhat-release
 ln -snf $PACKAGE-release $INSTALL_ROOT/etc/system-release
diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index 908555d..7b3a55b 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -310,6 +310,6 @@
 
 # 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\"/" /etc/os-release
-sed -i "/^PRETTY_NAME/ s/.*/PRETTY_NAME=\"$PRODUCT release $VERSION\"/" /etc/os-release
+sed -i "/^REDHAT_BUGZILLA_PRODUCT=/ s/.*/REDHAT_BUGZILLA_PRODUCT=\"$PRODUCT $VERSION\"/" /etc/os-release
+sed -i "/^PRETTY_NAME/ s/.*/PRETTY_NAME=\"$PRODUCT $VERSION\"/" /etc/os-release
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d47ce01d200ce50ab570f82eae0641b3353f7f7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>