X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml2usb;h=4b706cc798906873df08f7d5fe3f646b1da3431d;hb=9015273829f8fcee111558dc9ae63cf1012e6178;hp=5feb238d2e6d6d1950b440335e9d1678d689fa4a;hpb=7874f974499ad214ef6d0f8ae726317f78df453d;p=grml2usb.git

diff --git a/grml2usb b/grml2usb
index 5feb238..4b706cc 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1150,10 +1150,18 @@ def copy_bootloader_files(iso_mount, target, grml_flavour):
     grub_target = target + '/boot/grub/'
     execute(mkdir, grub_target)
 
-
     logo = search_file('logo.16', iso_mount)
     exec_rsync(logo, syslinux_target + 'logo.16')
 
+    bootx64_efi = search_file('bootx64.efi', iso_mount)
+    if bootx64_efi:
+        mkdir(target + '/efi/boot/')
+        exec_rsync(bootx64_efi, target + '/efi/boot/bootx64.efi')
+
+    efi_img = search_file('efi.img', iso_mount)
+    if efi_img:
+        mkdir(target + '/boot/')
+        exec_rsync(efi_img, target + '/boot/efi.img')
 
     for ffile in ['f%d' % number for number in range(1, 11) ]:
         search_and_copy(ffile, iso_mount, syslinux_target + ffile)
@@ -1177,7 +1185,6 @@ def copy_bootloader_files(iso_mount, target, grml_flavour):
         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.")
-        logging.critical("       Please visit http://grml.org/grml2usb/#grml2usb-compat for further information.")
         raise
 
     for expr in name, 'distri.cfg', \