Branch 'f18-branch' - 3 commits - imgcreate/live.py Makefile

[Brian C. Lane]

Makefile          |    2 +-
 imgcreate/live.py |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 864071c175b0f36af71d17414be34f8c16e0b608
Author: Brian C. Lane 
Date:   Thu Sep 13 14:02:26 2012 -0700

Version 18.11

diff --git a/Makefile b/Makefile
index c3f33a3..04acde9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@

-VERSION = 18.10
+VERSION = 18.11

INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}

commit 5de9176a1bf9ae7e21c0f7e6293e3b3293d98fff
Author: Brian C. Lane 
Date:   Thu Sep 13 07:32:22 2012 -0700

not copying UEFI files shouldn't be fatal (#856893)

This reverts the change that made copying EFI files fatal and instead
    logs a warning that UEFI won't be supported on the image.
    (cherry picked from commit 80b3559390d84cb43b68d280b6dbf617b684f64a)

diff --git a/imgcreate/live.py b/imgcreate/live.py
index 528d885..c5f757c 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -804,7 +804,8 @@ search --no-floppy --set=root -l '%(isolabel)s'
         """Set up the configuration for an EFI bootloader"""
         if self.__copy_efi_files(isodir):
             shutil.rmtree(isodir + "/EFI")
-            raise CreatorError("Failed to copy EFI files")
+            logging.warn("Failed to copy EFI files, no EFI Support will be included.")
+            return

cfg = self.__get_basic_efi_config(isolabel = self.fslabel,
                                           timeout = self._timeout)

commit 7f920f2bd695bc30729c1b9fc9ac0c60a5a49281
Author: Brian C. Lane 
Date:   Thu Sep 13 07:25:17 2012 -0700

don't require shim and grub2-efi (#856893)

32 bit builds don't support UEFI so let comps or the kickstart handle
    including shim and grub2-efi instead of making them hard-coded.
    (cherry picked from commit 61e85caa54f32bd695f70e29068ae26b99451471)

diff --git a/imgcreate/live.py b/imgcreate/live.py
index 73e3466..528d885 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -400,7 +400,7 @@ class x86LiveImageCreator(LiveImageCreatorBase):
         return options

def _get_required_packages(self):
-        return ["syslinux", "grub2-efi", "shim"] \
+        return ["syslinux"] \
                + LiveImageCreatorBase._get_required_packages(self)

def _get_isolinux_stanzas(self, isodir):