From: Michael Prokop <mika@grml.org>
Date: Mon, 4 Jun 2012 21:23:49 +0000 (+0200)
Subject: Ignore --uefi option for isohybrid on 32bit systems
X-Git-Tag: v0.19.4~7
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=61048123d869bd74b6f05ee2995a736078716eb2

Ignore --uefi option for isohybrid on 32bit systems

This avoids this misleading error message:

| * Creating hybrid ISO file with isohybrid method
| * Detected uefi support for isohybrid, enabling
| isohybrid: /srv/jenkins/jobs/grml32-full_testing/workspace/grml_isos/grml32-full_testing_20120603.iso: unable to find efi image
|                                                                          [ !! ]
---

diff --git a/grml-live b/grml-live
index b62e89b..ef840f6 100755
--- a/grml-live
+++ b/grml-live
@@ -1357,9 +1357,14 @@ else
           #   (hidden NTFS, IIRC), as the partition type is sometimes needed
           #   to get the BIOS even look at the partition created by isohybrid
           if isohybrid --help | grep -q -- --uefi ; then
-            log   "Detected uefi support for isohybrid, enabling"
-            einfo "Detected uefi support for isohybrid, enabling"
-            ISOHYBRID_OPTIONS=--uefi
+            if echo $CLASSES | grep -qw I386 ; then
+              log   "Detected uefi support for isohybrid but 32bit systems do not support it, ignoring."
+              einfo "Detected uefi support for isohybrid but 32bit systems do not support it, ignoring."
+            else
+              log   "Detected uefi support for isohybrid, enabling"
+              einfo "Detected uefi support for isohybrid, enabling"
+              ISOHYBRID_OPTIONS=--uefi
+            fi
           fi
 
           log "isohybrid $ISOHYBRID_OPTIONS ${ISO_OUTPUT}/${ISO_NAME}"