X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=632134e42de18be92a33a0781d125d5870861be3;hp=2bb543905d31cfebb10fbf46e8543f81787acb26;hb=0199b47c662ba6a5f0b15020d034fa9528a2c1d9;hpb=68df4a8c900486fc17138b4da1fe1f0847c45396

diff --git a/grml2usb b/grml2usb
index 2bb5439..632134e 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1102,8 +1102,16 @@ def copy_bootloader_files(iso_mount, target):
         bootsplash = search_file(ffile, iso_mount)
         exec_rsync(bootsplash, syslinux_target + ffile)
 
-    for filename in 'addons.cfg', 'default.cfg', 'distri.cfg', 'hidden.cfg', 'grml.cfg', 'grml.png', 'hd.cfg', 'isoprompt.cfg', 'options.cfg','vesamenu.c32', 'vesamenu.cfg', 'grml.png':
-        path = search_file(filename, iso_mount)
+    if not search_file('default.cfg', iso_mount + '/boot/isolinux/'):
+        logging.critical("Fatal: file default.cfg could not be found.")
+        logging.critical("Note:  this grml2usb version requires an ISO generated by grml-live >=0.9.24 ...")
+        logging.critical("       ... either use grml releases >=2009.10 or switch to an older grml2usb version.")
+        raise
+
+    for filename in 'addons.cfg', 'default.cfg', 'distri.cfg', 'hidden.cfg', \
+                    'grml.cfg', 'grml.png', 'hd.cfg', 'isoprompt.cfg', 'options.cfg', \
+                    'vesamenu.c32', 'vesamenu.cfg', 'grml.png':
+        path = search_file(filename, iso_mount + '/boot/isolinux/')
         exec_rsync(path, syslinux_target + filename)
 
     grub_target = target + '/boot/grub/'