2014-01-14 13:54:29 +04:00
|
|
|
diff -Nur livecd-tools-18.8.old/imgcreate/live.py livecd-tools-18.8/imgcreate/live.py
|
2014-01-21 12:47:57 +04:00
|
|
|
--- livecd-tools-18.8.old/imgcreate/live.py 2014-01-21 12:24:04.000000000 +0400
|
|
|
|
|
+++ livecd-tools-18.8/imgcreate/live.py 2014-01-21 12:45:02.875216282 +0400
|
|
|
|
|
@@ -325,6 +325,14 @@
|
2014-01-14 19:43:05 +04:00
|
|
|
subprocess.call(["/usr/bin/isohybrid", "-u", iso])
|
|
|
|
|
else:
|
|
|
|
|
subprocess.call(["/usr/bin/isohybrid", iso])
|
2014-01-21 12:47:57 +04:00
|
|
|
+
|
|
|
|
|
+ arch = getBaseArch()
|
|
|
|
|
+ if arch in ("i386", "i586", "i686"):
|
|
|
|
|
+ subprocess.call(["/usr/bin/rosa-image-fix-x86.pl", iso])
|
|
|
|
|
+ logging.warn("iso hacked with x86 version of script")
|
|
|
|
|
+ elif arch in ("x86_64",):
|
|
|
|
|
+ subprocess.call(["/usr/bin/rosa-image-fix-x86_64.pl", iso])
|
|
|
|
|
+ logging.warn("iso hacked with x86_64 version of script")
|
2014-01-14 19:43:05 +04:00
|
|
|
|
|
|
|
|
self.__implant_md5sum(iso)
|
|
|
|
|
|
2014-01-21 12:47:57 +04:00
|
|
|
@@ -671,7 +679,7 @@
|
|
|
|
|
return """label local
|
|
|
|
|
menu label Boot from local drive
|
|
|
|
|
menu default
|
|
|
|
|
- localboot 0x80
|
|
|
|
|
+ localboot 0xffff
|
|
|
|
|
"""
|
2014-01-14 13:54:29 +04:00
|
|
|
|
2014-01-21 12:47:57 +04:00
|
|
|
def __get_grub2_stanza(self, isodir):
|
