summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsegfault <segfault@riseup.net>2019-05-23 17:29:02 +0200
committersegfault <segfault@riseup.net>2019-05-23 17:40:00 +0200
commit6e097195f13e44a4664051cad79f32dc2f134c9f (patch)
treea3a3bd1c4071b823c8f653e353bf0518f47aa91b
parentc20c23de8ec62bb7ab38f056df477c6da250f04a (diff)
create-usb-image-from-iso: Use syslinux from chroot (refs: #16748)
We used the syslinux from the vagrant box before, which caused issues with when building Tails/Buster with a Stretch vagrant box and then cloning the image via Tails Installer with syslinux from Buster.
-rwxr-xr-xauto/scripts/create-usb-image-from-iso6
1 files changed, 3 insertions, 3 deletions
diff --git a/auto/scripts/create-usb-image-from-iso b/auto/scripts/create-usb-image-from-iso
index 7005571..16776d0 100755
--- a/auto/scripts/create-usb-image-from-iso
+++ b/auto/scripts/create-usb-image-from-iso
@@ -39,8 +39,8 @@ GET_UDISKS_OBJECT_TIMEOUT = 2
# the partition table, reserved sectors, and filesystem metadata.
SYSTEM_PARTITION_ADDITIONAL_SIZE = 10
-SYSLINUX_COM32MODULES_DIR = '/usr/lib/syslinux/modules/bios'
-
+SYSLINUX_COM32MODULES_DIR = 'chroot/usr/lib/syslinux/modules/bios'
+CHROOT_SYSLINUX_BIN='chroot/usr/bin/syslinux'
class ImageCreationError(Exception):
pass
@@ -269,7 +269,7 @@ class ImageCreator(object):
# device would cause this issue:
# https://bugs.chromium.org/p/chromium/issues/detail?id=508713#c8
execute([
- 'syslinux',
+ CHROOT_SYSLINUX_BIN,
'--offset', str(self.partition.props.partition.props.offset),
'--directory', '/syslinux/',
'--install', self.image