summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsegfault <segfault@riseup.net>2019-05-27 16:11:58 +0200
committersegfault <segfault@riseup.net>2019-05-27 16:11:58 +0200
commitc9bd2f2917a0e8195b7ce0a7c99f23308fabde17 (patch)
tree495b0258b0ecf92a492ce52f367e9b0af42a8b92
parent6e097195f13e44a4664051cad79f32dc2f134c9f (diff)
create-usb-image-from-iso: Add comment and variable prefix (refs: #16748)
-rwxr-xr-xauto/scripts/create-usb-image-from-iso8
1 files changed, 6 insertions, 2 deletions
diff --git a/auto/scripts/create-usb-image-from-iso b/auto/scripts/create-usb-image-from-iso
index 16776d0..ebc78bf 100755
--- a/auto/scripts/create-usb-image-from-iso
+++ b/auto/scripts/create-usb-image-from-iso
@@ -39,7 +39,11 @@ GET_UDISKS_OBJECT_TIMEOUT = 2
# the partition table, reserved sectors, and filesystem metadata.
SYSTEM_PARTITION_ADDITIONAL_SIZE = 10
-SYSLINUX_COM32MODULES_DIR = 'chroot/usr/lib/syslinux/modules/bios'
+# We use the syslinux from the chroot here, because it's the same one
+# that will be available to Tails Installer in the running Tails. Using
+# the same syslinux version here and in Tails Installer is important to
+# prevent issues when upgrading a Tails device via Tails Installer.
+CHROOT_SYSLINUX_COM32MODULES_DIR = 'chroot/usr/lib/syslinux/modules/bios'
CHROOT_SYSLINUX_BIN='chroot/usr/bin/syslinux'
class ImageCreationError(Exception):
@@ -252,7 +256,7 @@ class ImageCreator(object):
com32modules = [f for f in os.listdir(syslinux_dir) if f.endswith('.c32')]
for module in sorted(com32modules):
- src_path = os.path.join(SYSLINUX_COM32MODULES_DIR, module)
+ src_path = os.path.join(CHROOT_SYSLINUX_COM32MODULES_DIR, module)
if not os.path.isfile(src_path):
raise ImageCreationError("Could not find the '%s' COM32 module" % module)