X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=89874503f4ba2456dd59d7f336b201a35dc828e2;hp=ab6f98135ec25519a2078e9874c9ad2ac888973d;hb=c021230b57ee91d9b44f42e97ec7c28404ce77c1;hpb=b48ba994f1c4902f208c62180b3523a16d7db1df;ds=sidebyside

diff --git a/grml2usb b/grml2usb
index ab6f981..8987450 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1230,16 +1230,18 @@ def copy_grml_files(iso_mount, target):
             exec_rsync(grml_file, grml_webimg_target + myfile)
 
 
-def handle_addon_copy(filename, dst, iso_mount):
+def handle_addon_copy(filename, dst, iso_mount, ignore_errors=False):
     """handle copy of optional addons
 
     @filename: filename of the addon
     @dst: destination directory
     @iso_mount: location of the iso mount
+    @ignore_errors: don't report missing files
     """
     file_location = search_file(filename, iso_mount)
     if file_location is None:
-        logging.warn("Warning: %s not found (that's fine if you don't need it)",  filename)
+        if not ignore_errors:
+            logging.warn("Warning: %s not found (that's fine if you don't need it)",  filename)
     else:
         exec_rsync(file_location, dst)
 
@@ -1279,9 +1281,11 @@ def copy_addons(iso_mount, target):
     # memtest86+ image
     handle_addon_copy('memtest', addons, iso_mount)
 
-    # gpxe.lkrn
-    handle_addon_copy('gpxe.lkrn', addons, iso_mount)
+    # gpxe.lkrn: got replaced by ipxe
+    handle_addon_copy('gpxe.lkrn', addons, iso_mount, ignore_errors=True)
 
+    # ipxe.lkrn
+    handle_addon_copy('ipxe.lkrn', addons, iso_mount)
 
 def glob_and_copy(filepattern, dst):
     """Glob on specified filepattern and copy the result to dst