[node-patches] Change in ovirt-node[master]: Add product info in %post, but inside the chroot

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Add product info in %post, but inside the chroot
......................................................................

Add product info in %post, but inside the chroot

If we do it afterwards, we miss dracut generation, regenerating
the initramfs again after will take time without much benefit.

To populate it, bring verion info into regular %post as well

Change-Id: I01df8739994b9262a7d870722b69fbd999860a50
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1181987
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-nochroot.ks
M recipe/common-post.ks
2 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/71/36971/1

diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks
index 25e7b22..271f84f 100644
--- a/recipe/common-nochroot.ks
+++ b/recipe/common-nochroot.ks
@@ -97,11 +97,6 @@
 echo "Kernel \r on an \m (\l)" >> $INSTALL_ROOT/etc/issue
 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')
 
 %include common-efi.ks
diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index 1afe223..af65312 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -1,3 +1,6 @@
+
+%include version.ks
+
 # -*-Shell-script-*-
 echo "Starting Kickstart Post"
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -303,3 +306,8 @@
    -e "/user_friendly_names/ d" \
    /etc/multipath.conf
 
+# 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
+


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01df8739994b9262a7d870722b69fbd999860a50
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>