[Fedora-livecd-list] Branch 'f16-branch' - 2 commits - imgcreate/live.py Makefile

[Brian C. Lane]

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

New commits:
commit 80f4d827ef34e1344aa91460f27a13145614115d
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Thu May 3 16:02:41 2012 -0700

    Version 16.15

diff --git a/Makefile b/Makefile
index 52821b8..b5c389d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 16.14
+VERSION = 16.15
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit b6705d5f22cceead3ceb3bad2141bc4bcf6c492f
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Thu May 3 14:35:19 2012 -0700

    isohybrid on f16 doesn't support -u or -m

diff --git a/imgcreate/live.py b/imgcreate/live.py
index c973089..53c9665 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -319,10 +319,7 @@ class LiveImageCreatorBase(LoopImageCreator):
             raise CreatorError("ISO creation failed!")
 
         if os.path.exists("/usr/bin/isohybrid"):
-            if os.path.exists(isodir + "/isolinux/efiboot.img"):
-                subprocess.call(["/usr/bin/isohybrid", "-u",
"-m", iso])
-            else:
-                subprocess.call(["/usr/bin/isohybrid", iso])
+            subprocess.call(["/usr/bin/isohybrid", iso])
 
         self.__implant_md5sum(iso)