[Pkg-privacy-commits] [tails-installer] 207/210: Update syslinux and make it use -f every time

[Intrigeri]

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

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit fc7260348c8f57b8a504b55cb90b6437da1936ae
Author: Martin Briza <mbriza at redhat.com>
Date:   Wed Nov 18 15:12:48 2015 +0100

    Update syslinux and make it use -f every time
    
    Fixes issues with 32b images
---
 liveusb/creator.py |   6 ++----
 tools/syslinux.exe | Bin 71168 -> 243712 bytes
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 835896e..2f2fcc5 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -902,8 +902,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
                         os.path.join(syslinux_path, "extlinux.conf"))
             self.popen("extlinux -i '%s'" % syslinux_path)
         else: # FAT
-            self.popen('syslinux%s%s -d %s %s' %  (self.opts.force and
-                       ' -f' or '', self.opts.safe and ' -s' or '',
+            self.popen('syslinux%s -f -d %s %s' %  (self.opts.safe and ' -s' or '',
                        'syslinux', self.drive['device']))
 
     def get_free_bytes(self, device=None):
@@ -1335,8 +1334,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
                 self.log.debug(_("Removing") + " %s" % ldlinux)
                 os.unlink(ldlinux)
 
-        self.popen('syslinux%s%s -m -a -d %s %s' %  (self.opts.force and ' -f'
-                   or '', self.opts.safe and ' -s' or '', 'syslinux', device))
+        self.popen('syslinux%s -m -a -d %s %s' %  (self.opts.safe and ' -s' or '', 'syslinux', device))
 
     # Cache these, because they are fairly expensive
     _win32_logicaldisk = {}
diff --git a/tools/syslinux.exe b/tools/syslinux.exe
index a67dc0d..d8e157c 100644
Binary files a/tools/syslinux.exe and b/tools/syslinux.exe differ

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