From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 17 Jul 2014 20:19:21 +0000 (+0200)
Subject: Support new version of syslinux
X-Git-Tag: 20140723~16
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/novaboot.git/commitdiff_plain/6ca65323d2b8473209d1cf0565c7aae2dc7239f7

Support new version of syslinux

Support for older version was dropped. Let me know if somebody needs it.
---

diff --git a/debian/control b/debian/control
index 296c2cb..292cb05 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: novaboot
 Architecture: all
 Depends: perl, libexpect-perl, ${misc:Depends}
 Recommends: perl-doc, rsync, qemu-system, openssh-client,
- syslinux, genisoimage, amtterm, libwww-perl, procps, sudo, file
+ isolinux, syslinux-utils, genisoimage, amtterm, libwww-perl, procps,
+ sudo, file
 Suggests: scons, make, isc-dhcp-server, tftpd-hpa, iproute | iproute2
 Description: Tool for booting operating systems on remote hardware
  This program makes booting of an operating system (e.g. Linux or
diff --git a/novaboot b/novaboot
index d3cc4e7..15aa9f9 100755
--- a/novaboot
+++ b/novaboot
@@ -800,7 +800,8 @@ foreach my $script (@scripts) {
 ## Generate ISO image
 if (defined $iso_image) {
     system_verbose("mkdir -p isolinux");
-    system_verbose('cp /usr/lib/syslinux/isolinux.bin /usr/lib/syslinux/mboot.c32 /usr/lib/syslinux/menu.c32 isolinux');
+    # FIXME: Does somebody need support for older syslinux (without ldlinux etc.)?
+    system_verbose('cp /usr/lib/ISOLINUX/isolinux.bin /usr/lib/syslinux/modules/bios/mboot.c32 /usr/lib/syslinux/modules/bios/menu.c32 /usr/lib/syslinux/modules/bios/ldlinux.c32 isolinux');
     open(my $fh, ">isolinux/isolinux.cfg");
     if ($#scripts) {
 	print $fh "TIMEOUT 50\n";
@@ -811,7 +812,7 @@ if (defined $iso_image) {
     print $fh "$menu_iso";
     close($fh);
 
-    my $files = join(" ", map("$_=$_", (keys(%files_iso), 'isolinux/isolinux.bin', 'isolinux/isolinux.cfg', 'isolinux/mboot.c32', 'isolinux/menu.c32')));
+    my $files = join(" ", map("$_=$_", (keys(%files_iso), 'isolinux/isolinux.bin', 'isolinux/isolinux.cfg', 'isolinux/mboot.c32', 'isolinux/ldlinux.c32', 'isolinux/menu.c32')));
     $iso_image ||= "$config_name.iso";
 
     # Note: We use -U flag below to "Allow 'untranslated' filenames,