From 8c9ee78ab584224e89c0a03da005c4e3bcf19ff1 Mon Sep 17 00:00:00 2001
From: Ramakrishnan G <rameshg87@gmail.com>
Date: Thu, 23 Oct 2014 22:24:18 +0530
Subject: [PATCH] iso element to use 'search --label' for grub

Current iso element uses 'search --file' to find the
grub root.  This is a wrong approach as it may find
some other partition containing /vmlinuz. Instead modify
it to search for grub root by the label of ISO image.

Closes-Bug: 1384826
Change-Id: Id4217be3420597bed2f80a96788928259ec91582
---
 elements/iso/cleanup.d/100-build-iso |   4 ++--
 elements/iso/cleanup.d/efiboot.img   | Bin 1474560 -> 1474560 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/elements/iso/cleanup.d/100-build-iso b/elements/iso/cleanup.d/100-build-iso
index 2711a1a12..414c5420a 100755
--- a/elements/iso/cleanup.d/100-build-iso
+++ b/elements/iso/cleanup.d/100-build-iso
@@ -20,7 +20,7 @@ set -o pipefail
 function build_efiboot_img() {
 
     cat > "$TMP_BUILD_DIR/grub-embedded.cfg" << END_CONFIG
-search --file --set=root /vmlinuz
+search --set=root --label VMEDIA_BOOT_ISO
 set prefix=(\$root)/EFI/BOOT/
 END_CONFIG
 
@@ -127,7 +127,7 @@ END_CONFIG
 
     # Create the ISO
     echo "Generating the ISO"
-    $MKISOFS -r -V "INSTALL_IMAGE" -cache-inodes -J -l \
+    $MKISOFS -r -V "VMEDIA_BOOT_ISO" -cache-inodes -J -l \
     -b isolinux/isolinux.bin  -no-emul-boot \
     -boot-load-size 4 -boot-info-table \
     -eltorito-alt-boot -e isolinux/efiboot.img \
diff --git a/elements/iso/cleanup.d/efiboot.img b/elements/iso/cleanup.d/efiboot.img
index d2b13b2603a8197883b76a7bd6759d3a44fc7d27..94407c70fb9c2229edb5205428142576b7c8f0ec 100644
GIT binary patch
delta 408
zcmZo@h-zqvnxM`Se_)31M(szcyeU~3;jZDX3=AN8dgFf%{p}ZK@cv*TkDPdceUb~W
zFN&ee3?QJVrvL*23@GwoX$B{M{}8AGH2LX?+5F-l=kzlI&DKHD%YxtR$(C*=LMR$o
z85n{DwjZ3q+sHV{ql5XTiDz@SM|-yiBM>tIF*6Xe05K~NvjH(X5OV-AClGT1F*gwN
z05LBR^8qpc_HGY>I46bT)DqjG{QMFHUEQ3-q|_XRFke>}PsezWx8gm6{iic_3&^#r
XcMAZqAP@@yu`m#eY*+6Vz4-+I-@%43

delta 409
zcmZo@h-zqvnxM|I@F`o^M(szcybL}Z9<Cm)3}AYC<9`nQ?H6Y7{$L`HoOpqKk_)dd
zilNL5AfTtG00ROL%V3s*r5T+3{X?J%(B!8lX7h`KoYT(;G+PJ7Y!>`xPquV35kk?x
z%D@mLu>If+-bThr9v#dHM@^c$J=(iH7=f4xh?#+y1&CRJm<@>8ftUk`If0l9h`E87
z2Z(urm=B2gw|9F8#5qZ%W#*(R=;{`yme>~M=a(qxm*wVU=9N}W=j;}c<KTk$k)d6^
WTL6d!fmjHLg@IUPyLz|i%`X6Hm3f%}