From: Michael Prokop <mika@grml.org>
Date: Wed, 25 Feb 2015 13:41:32 +0000 (+0100)
Subject: Support usage of grml2usb on EFI systems
X-Git-Tag: v0.14.11~2
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=a3dde41af080b40f4fab46eba2950d0ea98b2785;hp=6868425f2674bc1443cb75bbb78991908d58646c

Support usage of grml2usb on EFI systems

Closes: #768906
---

diff --git a/debian/control b/debian/control
index 3b11cd7..c91f590 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Depends: mtools,
          python-parted,
          realpath,
          rsync,
-         syslinux | grub-pc,
+         syslinux | grub-pc | grub-efi-amd64,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: syslinux,
diff --git a/grml2usb b/grml2usb
index e608ac1..072f1b3 100755
--- a/grml2usb
+++ b/grml2usb
@@ -493,7 +493,8 @@ def install_grub(device):
             for opt in ["", "--force"]:
                 logging.debug("grub-install --recheck %s --no-floppy --root-directory=%s %s",
                               opt, device_mountpoint, grub_device)
-                proc = subprocess.Popen([GRUB_INSTALL, "--recheck", opt, "--no-floppy",
+                proc = subprocess.Popen([GRUB_INSTALL, "--recheck", opt,
+                                         "--no-floppy", "--target=i386-pc",
                                          "--root-directory=%s" % device_mountpoint, grub_device],
                                         stdout=file(os.devnull, "r+"))
                 proc.wait()