[Pkg-privacy-commits] [tails-installer] 16/24: Arch's syslinux mbr.bin is in /usr/lib/syslinux/bios (#818)

[anonym]

This is an automated email from the git hooks/post-receive script.

anonym-tails-guest pushed a commit to annotated tag 3.12.1
in repository tails-installer.

commit 4de64d4906fb61a6aa972bb157c0aba46190f82a
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 4 07:43:46 2014 -0700

    Arch's syslinux mbr.bin is in /usr/lib/syslinux/bios (#818)
---
 liveusb/creator.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 4b4da76..4a26dc5 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -874,7 +874,8 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
     def _get_mbr_bin(self):
         mbr = None
         for mbr_bin in ('/usr/lib/syslinux/mbr.bin',
-                        '/usr/share/syslinux/mbr.bin'):
+                        '/usr/share/syslinux/mbr.bin',
+                        '/usr/lib/syslinux/bios/mbr.bin'):
             if os.path.exists(mbr_bin):
                 mbr = mbr_bin
         return mbr

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git