[node-patches] Change in ovirt-node[ovirt-3.5]: Don't glob the initramfs, use explicit kernel versions

[fabiand at redhat.com]

Hello Ryan Barry,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/37099

to review the following change.

Change subject: Don't glob the initramfs, use explicit kernel versions
......................................................................

Don't glob the initramfs, use explicit kernel versions

We already build it with an explicit kernel version. Copy it out
with that as well, in case there are multiple initrds in /boot
for some reason

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1182048
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1182551
Change-Id: Id676ce0fb22ec7f8155b6814750820659a7ead6f
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-nochroot.ks
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/99/37099/1

diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks
index 25e7b22..dfe24ca 100644
--- a/recipe/common-nochroot.ks
+++ b/recipe/common-nochroot.ks
@@ -2,7 +2,8 @@
 %include version.ks
 
 echo "Copying the initrd out..."
-cp $INSTALL_ROOT/boot/*.img $LIVE_ROOT/isolinux/initrd0.img
+cp $INSTALL_ROOT/boot/initramfs-$(cd $INSTALL_ROOT/boot && ls vmlinuz-[23]* | \
+    sed -e 's/vmlinuz-//').img $LIVE_ROOT/isolinux/initrd0.img
 
 if [ -f "ovirt-authorized_keys" ]; then
   echo "Adding authorized_keys to Image"


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id676ce0fb22ec7f8155b6814750820659a7ead6f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>