[issue1266] grml2usb: Add Fedora's syslinux MBR path

[Till Maas]

New submission from Till Maas <opensource at till.name>:

- look for the syslinux MBR also in /usr/share/syslinux/mbr.bin, which
  is the correct path for it on Fedora
---
 grml2usb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/grml2usb b/grml2usb
index ab0ad63..eafee4b 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1567,7 +1567,20 @@ def handle_mbr(device):
 
     mbrcode = GRML2USB_BASE + '/mbr/mbrldr'
     if options.syslinuxmbr:
-        mbrcode = '/usr/lib/syslinux/mbr.bin'
+        mbrcode = ""
+        mbr_locations = ('/usr/lib/syslinux/mbr.bin',
+                         '/usr/share/syslinux/mbr.bin')
+        for mbrpath in mbr_locations:
+            if os.path.isfile(mbrpath):
+                mbrcode = mbrpath
+                break
+
+        if mbrcode is "":
+            str_locations = " or ".join(['"%s"' % l for l in mbr_locations])
+            logging.error('Cannot find syslinux MBR, install it at %s)',
+                          str_locations)
+            raise CriticalException("syslinux MBR  can not be found at %s."
+                                    % str_locations)
     elif options.mbrmenu:
         mbrcode = GRML2USB_BASE + '/mbr/mbrldr'
 
-- 
1.8.3.1

----------
messages: 4585
nosy: opensource
status: unread
title: grml2usb: Add Fedora's syslinux MBR path

_____________________________________
GRML issue tracker <bts at bts.grml.org>
<http://bts.grml.org/grml/issue1266>
_____________________________________