[Pkg-privacy-commits] [tails-installer] 06/07: Add additional syslinux paths

[Ulrike Uhlig]

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

u-guest pushed a commit to branch master
in repository tails-installer.

commit c3fc07c64eb7b1ae1f7aef61ba7fcc7853123be2
Author: Yuval Adam <yuval at y3xz.com>
Date:   Mon Feb 15 23:08:00 2016 +0200

    Add additional syslinux paths
    
    This path exists on Arch Linux systems, and since liveusb-creator is now
    packaged for Arch we should probably add it
---
 tails_installer/creator.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index 38ec961..4683c3c 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -997,6 +997,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
             for com32mod in com32modules:
                 copied = False
                 for orig_dir in ('/usr/lib/syslinux/modules/bios',
+                                 '/usr/lib/syslinux/bios',
                                  '/usr/share/syslinux',
                                  '/usr/lib/syslinux'):
                     com32path = os.path.join(orig_dir, com32mod)
@@ -1227,6 +1228,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
             for mbr_bin in ('/usr/lib/syslinux/mbr/gptmbr.bin',
                             '/usr/lib/SYSLINUX/gptmbr.bin',
                             '/usr/lib/syslinux/gptmbr.bin',
+                            '/usr/lib/syslinux/bios/gptmbr.bin',
                             '/usr/share/syslinux/gptmbr.bin'):
                 if os.path.exists(mbr_bin):
                     return mbr_bin

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