Do not use isohybrid altogether (for debugging)

This commit is contained in:
Evgenii Shatokhin 2017-01-31 18:10:10 +03:00
parent 20c4205338
commit 7b2e987cd6
2 changed files with 18 additions and 14 deletions

View file

@ -3,7 +3,7 @@
Summary: Tools for building live CDs
Name: livecd-tools
Version: 21.1
Release: 29
Release: 30
Epoch: 1
License: GPLv2+
Group: System/Base

View file

@ -1,18 +1,22 @@
diff -Naur livecd-tools-21.1-rosa-patches.orig/imgcreate/live.py livecd-tools-21.1-rosa-patches/imgcreate/live.py
--- livecd-tools-21.1-rosa-patches.orig/imgcreate/live.py 2016-12-03 17:28:22.000000000 +0300
+++ livecd-tools-21.1-rosa-patches/imgcreate/live.py 2017-01-30 17:31:08.914959199 +0300
@@ -332,12 +332,12 @@
if os.path.exists("/usr/bin/isohybrid"):
if os.path.exists(isodir + "/isolinux/efiboot.img"):
subprocess.call(["/usr/bin/isohybrid", "-u", iso])
+++ livecd-tools-21.1-rosa-patches/imgcreate/live.py 2017-01-31 18:07:53.199533509 +0300
@@ -329,18 +329,6 @@
if subprocess.call(args) != 0:
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", iso])
- subprocess.call(["/usr/bin/rosa-image-fix-x86.pl", iso])
+ # subprocess.call(["/usr/bin/rosa-image-fix-x86.pl", iso])
logging.warn("iso hacked with x86 version of script")
else:
subprocess.call(["/usr/bin/isohybrid", iso])
- logging.warn("iso hacked with x86 version of script")
-
- else:
- subprocess.call(["/usr/bin/isohybrid", iso])
- subprocess.call(["/usr/bin/rosa-image-fix-x86.pl", iso])
+ # subprocess.call(["/usr/bin/rosa-image-fix-x86.pl", iso])
logging.warn("iso hacked with x86 version of script")
- logging.warn("iso hacked with x86 version of script")
-
-
self.__implant_md5sum(iso)
def __implant_md5sum(self, iso):