summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-08-03 17:40:45 +0000
committerintrigeri <intrigeri@boum.org>2015-08-03 17:59:41 +0000
commit8e8445b879ff72a16becd332a2a26ef9f0c2b86c (patch)
treea2dff41b743d31e63a9f54c376e4787ff853a4c2
parent0bb4a2370c458414edca859cd4c467809aa8c0a7 (diff)
When running on Tails, always use the 32-bit syslinux binary.tails-installer_feature_4.2.1feature/jessie+9594-non-root
The 64-bit one will vanish, see #9748.
-rwxr-xr-xliveusb/creator.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 6c313c9..d2ecbd8 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1056,10 +1056,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
self.popen("extlinux -i '%s'" % syslinux_path)
else: # FAT
if is_running_from_tails():
- if platform.architecture()[0] == '64bit':
- syslinux_executable = 'syslinux-amd64';
- else:
- syslinux_executable = 'syslinux';
+ syslinux_executable = 'syslinux';
self.log.debug('Will use %s as the syslinux binary'
% syslinux_executable)
iso_syslinux = self.get_liveos_file_path('utils', 'linux', syslinux_executable)