mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
|
index 269e425..15c0a7c 100755
|
|
--- a/imgcreate/live.py
|
|
+++ b/imgcreate/live.py
|
|
@@ -331,7 +331,7 @@ class LiveImageCreatorBase(LoopImageCreator):
|
|
|
|
if os.path.exists("/usr/bin/isohybrid"):
|
|
if os.path.exists(isodir + "/isolinux/efiboot.img"):
|
|
- subprocess.call(["/usr/bin/isohybrid", "-u", "-m", iso])
|
|
+ subprocess.call(["/usr/bin/isohybrid", "-u", iso])
|
|
subprocess.call(["/usr/bin/rosa-image-fix-x86.pl", iso])
|
|
logging.warn("iso hacked with x86 version of script")
|
|
|
|
@@ -403,9 +403,9 @@ class x86LiveImageCreator(LiveImageCreatorBase):
|
|
if os.path.exists(isodir + "/isolinux/efiboot.img"):
|
|
options.extend([ "-eltorito-alt-boot",
|
|
"-e", "isolinux/efiboot.img",
|
|
- "-no-emul-boot",
|
|
- "-eltorito-alt-boot",
|
|
- "-e", "isolinux/macboot.img",
|
|
+# "-no-emul-boot",
|
|
+# "-eltorito-alt-boot",
|
|
+# "-e", "isolinux/macboot.img",
|
|
"-no-emul-boot"])
|
|
return options
|
|
|
|
@@ -752,7 +752,8 @@ menu end
|
|
missing.append("Missing EFI file (%s)" % (src,))
|
|
fail = True
|
|
else:
|
|
- shutil.copy(src_glob[0], isodir+dest)
|
|
+ for src_file in src_glob:
|
|
+ shutil.copy(src_file, isodir+dest)
|
|
map(logging.error, missing)
|
|
return fail
|
|
|