Fix #7 : Support isohybrid UEFI support

This commit is contained in:
Kevin Kim
2021-04-19 17:43:44 +09:00
parent f09885abff
commit d92694c678
2 changed files with 19 additions and 2 deletions

14
debian/changelog vendored
View File

@@ -1,3 +1,17 @@
systemback (1.9.4hamonikr9) jin; urgency=low
* Update systemback/systemback.cpp
- Fix #7 : Support isohybrid UEFI support
-- HamoniKR <pkg@hamonikr.org> Mon, 19 Apr 2021 16:26:12 +0900
systemback (1.9.4hamonikr8) jin; urgency=low
* Update systemback/systemback.cpp
- genisoimage option change
-- HamoniKR <pkg@hamonikr.org> Mon, 19 Apr 2021 09:51:06 +0900
systemback (1.9.4hamonikr7) jin; urgency=low
* Update systemback/systemback.cpp

View File

@@ -7469,7 +7469,9 @@ void systemback::on_livenew_clicked()
if(! (sb::rename(sb::sdir[2] % "/.sblivesystemcreate/syslinux/syslinux.cfg", sb::sdir[2] % "/.sblivesystemcreate/syslinux/isolinux.cfg") && sb::rename(sb::sdir[2] % "/.sblivesystemcreate/syslinux", sb::sdir[2] % "/.sblivesystemcreate/isolinux")) || intrrpt) return err();
ui->progressbar->setValue(0);
if(sb::exec("genisoimage -iso-level 3 -allow-limited-size -r -V H-LIVE -cache-inodes -J -l -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -c isolinux/boot.cat -o \"" % sb::sdir[2] % "\"/" % ifname % ".iso \"" % sb::sdir[2] % "\"/.sblivesystemcreate", sb::Prgrss))
// if(sb::exec("genisoimage -r -V H-LIVE -cache-inodes -J -l -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -c isolinux/boot.cat -o \"" % sb::sdir[2] % "\"/" % ifname % ".iso \"" % sb::sdir[2] % "\"/.sblivesystemcreate", sb::Prgrss))
if(sb::exec("genisoimage -r -V H-LIVE -cache-inodes -J -l -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -c isolinux/boot.cat -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -o \"" % sb::sdir[2] % "\"/" % ifname % ".iso \"" % sb::sdir[2] % "\"/.sblivesystemcreate", sb::Prgrss))
{
if(sb::isfile(sb::sdir[2] % '/' % ifname % ".iso")) sb::remove(sb::sdir[2] % '/' % ifname % ".iso");
return err(312);
@@ -7507,7 +7509,8 @@ void systemback::on_liveconvert_clicked()
pset(21, " 2/2"),
sb::Progress = -1,
ui->progressbar->setValue(0);
if(sb::exec("genisoimage -iso-level 3 -allow-limited-size -r -V H-LIVE -cache-inodes -J -l -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -c isolinux/boot.cat -o \"" % path % "\".iso \"" % sb::sdir[2] % "\"/.sblivesystemconvert", sb::Prgrss)) return err(325);
// if(sb::exec("genisoimage -r -V H-LIVE -cache-inodes -J -l -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -c isolinux/boot.cat -o \"" % path % "\".iso \"" % sb::sdir[2] % "\"/.sblivesystemconvert", sb::Prgrss)) return err(325);
if(sb::exec("genisoimage -r -V H-LIVE -cache-inodes -J -l -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -c isolinux/boot.cat -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -o \"" % path % "\".iso \"" % sb::sdir[2] % "\"/.sblivesystemconvert", sb::Prgrss)) return err(325);
if(sb::exec("isohybrid \"" % path % "\".iso") || ! cfmod(path % ".iso", 0666)) return err();
sb::remove(sb::sdir[2] % "/.sblivesystemconvert");
if(intrrpt) return err();