From d58a4ca481e02d3e8aa952bd6251a99cd86986d0 Mon Sep 17 00:00:00 2001 From: jmckenna Date: Fri, 6 Apr 2018 10:39:25 -0400 Subject: [PATCH] pxe-network-installer to use updeated grub pxe-network-installer package modifed to use update version of grub2 (0.64) Change-Id: I94f3c010b8d32474d82c27df68621788e44511de Depends-On: https://review.openstack.org/#/c/578440 --- .../centos/pxe-network-installer.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/installer/pxe-network-installer/centos/pxe-network-installer.spec b/installer/pxe-network-installer/centos/pxe-network-installer.spec index 5defd020..916c94bf 100644 --- a/installer/pxe-network-installer/centos/pxe-network-installer.spec +++ b/installer/pxe-network-installer/centos/pxe-network-installer.spec @@ -41,8 +41,9 @@ Source057: efi-centos-pxe-smallsystem_lowlatency-install BuildRequires: syslinux BuildRequires: grub2 +BuildRequires: grub2-efi-x64-pxeboot -Requires: grub2-efi-pxeboot +Requires: grub2-efi-x64-pxeboot %description TIS Network Installation @@ -56,7 +57,7 @@ install -v -d -m 755 %{buildroot}/pxeboot/pxelinux.cfg.files install -v -d -m 755 %{buildroot}/pxeboot/rel-%{platform_release} install -v -d -m 755 %{buildroot}/pxeboot/EFI install -v -d -m 755 %{buildroot}/pxeboot/EFI/centos -install -v -d -m 755 %{buildroot}/pxeboot/EFI/centos/x86_64-efi +ln -s %{_prefix}/lib/grub/x86_64-efi %{buildroot}/pxeboot/EFI/centos/x86_64-efi install -v -m 644 %{_sourcedir}/vmlinuz-%{tis_image_version} \ %{buildroot}/pxeboot/rel-%{platform_release}/installer-bzImage_1.0 @@ -131,13 +132,6 @@ install -v -m 0644 \ %{_datadir}/syslinux/gpxelinux.0 \ %{buildroot}/pxeboot -# Copy files from grub2. Centos UEFI bootloader expect these files -install -v -m 0644 \ - %{_prefix}/lib/grub/i386-pc/command.lst \ - %{_prefix}/lib/grub/i386-pc/fs.lst \ - %{_prefix}/lib/grub/i386-pc/crypto.lst \ - %{_prefix}/lib/grub/i386-pc/terminal.lst \ - %{buildroot}/pxeboot/EFI/centos/x86_64-efi # Copy Titanium grub.cfg. It will be used to create ISO on the Controller. install -v -m 0644 %{_sourcedir}/grub.cfg \ %{buildroot}/pxeboot/EFI/