[node-patches] Change in ovirt-node[master]: Update the recipes to move modified initrds out

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Update the recipes to move modified initrds out
......................................................................

Update the recipes to move modified initrds out

Move dracut creation out of common-post so distro-specific
changes can go in without running dracut multiple times.

Pass the right kernel version into dracut so we don't pick up
whatever `uname -r` is in koji, brew, or other build
environments.

livecd-creator copies the initrd out before post script runs, so
move it out ourselves when we're done to pick up updates.

Change-Id: I3da516d2b29c1adde28811c5b47da1199385b70e
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1152948
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-nochroot.ks
M recipe/common-post.ks
A recipe/dracut-post.ks
M recipe/ovirt-node-image.ks.in
4 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/14/35414/1

diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks
index f9ee49b..e3c324e 100644
--- a/recipe/common-nochroot.ks
+++ b/recipe/common-nochroot.ks
@@ -1,6 +1,9 @@
 
 %include version.ks
 
+echo "Copying the initrd out..."
+cp $INSTALL_ROOT/boot/*.img $LIVE_ROOT/isolinux/initrd0.img
+
 if [ -f "ovirt-authorized_keys" ]; then
   echo "Adding authorized_keys to Image"
   mkdir -p $INSTALL_ROOT/root/.ssh
diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index ba0b9fa..f20f107 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -288,6 +288,3 @@
 fi
 
 python -m compileall /usr/lib/python2.*/site-packages/sos
-
-echo "Regenerating initramfs"
-dracut -f || :
diff --git a/recipe/dracut-post.ks b/recipe/dracut-post.ks
new file mode 100644
index 0000000..8923bb8
--- /dev/null
+++ b/recipe/dracut-post.ks
@@ -0,0 +1,2 @@
+echo "Regenerating initramfs"
+dracut -f --kver `rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}" kernel` || :
diff --git a/recipe/ovirt-node-image.ks.in b/recipe/ovirt-node-image.ks.in
index d1903ad..591a3ea 100644
--- a/recipe/ovirt-node-image.ks.in
+++ b/recipe/ovirt-node-image.ks.in
@@ -14,6 +14,7 @@
 %post
 %include common-post.ks
 %include @DISTRO at -post.ks
+%include dracut-post.ks
 %end
 
 %post --nochroot


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

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