From 2fc61df51ef2345e1425d9d65b160c7b86fc44ac Mon Sep 17 00:00:00 2001 From: mbusb Date: Tue, 11 Apr 2017 22:25:39 +0530 Subject: [PATCH] Detect isolinux version 2 and install version 3 instead. --- scripts/iso.py | 2 +- scripts/syslinux.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/iso.py b/scripts/iso.py index be647cb..e0a0b93 100644 --- a/scripts/iso.py +++ b/scripts/iso.py @@ -151,7 +151,7 @@ def isolinux_version(isolinux_bin_path): :param isolinux_path: Path to "isolinux.bin" :return: Version number as string. """ - version = ["3", "4", "5", "6"] + version = ["2", "3", "4", "5", "6"] if isolinux_bin_path is not None: sl = list(strings(isolinux_bin_path)) for strin in sl: diff --git a/scripts/syslinux.py b/scripts/syslinux.py index 45687c8..3e44de5 100644 --- a/scripts/syslinux.py +++ b/scripts/syslinux.py @@ -111,6 +111,9 @@ def syslinux_distro_dir(usb_disk, iso_link, distro): isolinux_path = os.path.join(_iso_cfg_ext_dir, isolinux_bin_path(iso_link)) iso_linux_bin_dir = isolinux_bin_dir(iso_link) config.syslinux_version = isolinux_version(isolinux_path) + if int(config.syslinux_version) < 3: + log('Distro uses really old isolinux. Installing version 3 instead of 2.') + config.syslinux_version = '3' if distro == "generic" or distro == "alpine": install_dir = usb_mount @@ -158,7 +161,7 @@ def syslinux_distro_dir(usb_disk, iso_link, distro): distro_sys_install_bs = distro_sys_install_bs.replace("/", "\\") sys_cmd = syslinux_path + option + distro_syslinux_install_dir + ' ' + usb_disk + ' ' + \ distro_sys_install_bs - log ("\nExecuting ==> " + sys_cmd, '\n') + log("\nExecuting ==> " + sys_cmd, '\n') if subprocess.call(sys_cmd, shell=True) == 0: log ("\nSyslinux install was successful on distro directory...\n") else: