X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=6455aacecb87b8983b557ac4508990bc22d93125;hp=7fe868180bfa529d90aedc55835c44de61b420c6;hb=85933b53da2988f8fe263062fe4dbbfd83a211ff;hpb=7d35f0df00c826283dc3c0658c9c8748e7c561cb

diff --git a/grml2usb b/grml2usb
index 7fe8681..6455aac 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1117,6 +1117,12 @@ def copy_addons(iso_mount, target):
     else:
         exec_rsync(memtestimg, addons + 'memtest')
 
+    # gpxe.lkrn
+    gpxeimg = search_file('gpxe.lkrn', iso_mount)
+    if gpxeimg is None:
+        logging.warn("Warning: gpxe.lkrn not found (that's fine if you don't need it)")
+    else:
+        exec_rsync(gpxeimg, addons + 'gpxe.lkrn')
 
 def copy_bootloader_files(iso_mount, target):
     """copy grml's bootloader files to a given target
@@ -1132,6 +1138,8 @@ def copy_bootloader_files(iso_mount, target):
 
     for ffile in ['f%d' % number for number in range(1,11) ]:
         bootsplash = search_file(ffile, iso_mount)
+        if not bootsplash:
+            continue
         exec_rsync(bootsplash, syslinux_target + ffile)
 
     # avoid the "file is read only, overwrite anyway (y/n) ?" question
@@ -1214,8 +1222,8 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
             sys.exit(1)
 
     if not options.skipaddons:
-        if grml_flavour.endswith('-small'):
-            logging.info("Note: grml-small doesn't provide any addons, not installing them therefore.")
+        if not search_file('addons', iso_mount):
+            logging.info("Could not find addons, therefore not installing.")
         else:
             copy_addons(iso_mount, target)