One more fix for ISO image creation

diff --git a/debian/control b/debian/control
index 292cb05d168c4cf7a882b3ee3d9f24ec0d120841..60b153dc91207b990fed4a79e54412a3006ee7c3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: novaboot
 Architecture: all
 Depends: perl, libexpect-perl, ${misc:Depends}
 Recommends: perl-doc, rsync, qemu-system, openssh-client,
- isolinux, syslinux-utils, genisoimage, amtterm, libwww-perl, procps,
+ isolinux, syslinux-common, 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

diff --git a/novaboot b/novaboot
index 15aa9f9ad4b4ffd0bacd4f75127e2d0df3d22230..a4bf1cf13167d16bea8831ec3179b5f8710bc299 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -801,7 +801,7 @@ foreach my $script (@scripts) {
 if (defined $iso_image) {
     system_verbose("mkdir -p 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');
+    system_verbose('cp /usr/lib/ISOLINUX/isolinux.bin /usr/lib/syslinux/modules/bios/mboot.c32 /usr/lib/syslinux/modules/bios/libcom32.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";
@@ -812,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/ldlinux.c32', 'isolinux/menu.c32')));
+    my $files = join(" ", map("$_=$_", (keys(%files_iso), 'isolinux/isolinux.bin', 'isolinux/isolinux.cfg', 'isolinux/libcom32.c32', 'isolinux/mboot.c32', 'isolinux/ldlinux.c32', 'isolinux/menu.c32')));
     $iso_image ||= "$config_name.iso";
 
     # Note: We use -U flag below to "Allow 'untranslated' filenames,

diff --git a/tests/novaboot.wv b/tests/novaboot.wv
index 03f8ae441e284f9444cfe93a506c2e7d42da4d07..7cee40b020ca0f4da6714f23c65de685de9ca71e 100755 (executable)
--- a/tests/novaboot.wv
+++ b/tests/novaboot.wv
@@ -65,11 +65,9 @@ echo '$hypervisor="HYP";' > .novaboot
 WVPASS ./script --gen-only --pulsar
 WVPASS grep "exec HYP" config-novaboot
 
-exit 0
-
 # Broken
 WVSTART ISO image generation
 create_dummy
-WVPASS ./script --iso
+WVPASS ./script --iso --target ''
 
 # Hi-lock: (("^.*\\(?:WVSTART\\).*$" (0 (quote hi-black-b) t)))