[Pkg-privacy-commits] [tails-installer] 02/05: The mbr.bin on Ubuntu 14.10 moved to /usr/lib/syslinux/mbr (#818)

[anonym]

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

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

commit f8748188022f062c5e4b71eaebf958ccddcc1884
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Jan 16 09:31:50 2015 -0700

    The mbr.bin on Ubuntu 14.10 moved to /usr/lib/syslinux/mbr (#818)
---
 liveusb/creator.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 205d853..14f1977 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -925,7 +925,8 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
         mbr = None
         for mbr_bin in ('/usr/lib/syslinux/mbr.bin',
                         '/usr/share/syslinux/mbr.bin',
-                        '/usr/lib/syslinux/bios/mbr.bin'):
+                        '/usr/lib/syslinux/bios/mbr.bin',
+                        '/usr/lib/syslinux/mbr/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