nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[iso] add label update workaround for ArchLinux derivatives

Browse source
This commit is contained in:
Pete Batard 2016-08-14 15:45:29 +02:00
parent ce8fbd9934
commit ce6ded2111
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/iso.c
View file

@ -58,6 +58,7 @@ uint32_t GetInstallWimVersion(const char* iso);
typedef struct { typedef struct {
BOOLEAN is_syslinux_cfg; BOOLEAN is_syslinux_cfg;
BOOLEAN is_grub_cfg; BOOLEAN is_grub_cfg;
BOOLEAN is_arch_cfg;
BOOLEAN is_old_c32[NB_OLD_C32]; BOOLEAN is_old_c32[NB_OLD_C32];
} EXTRACT_PROPS; } EXTRACT_PROPS;
@ -80,6 +81,7 @@ static const char* install_wim_name[] = { "install.wim", "install.swm" };
static const char* grub_dirname = "/boot/grub/i386-pc"; static const char* grub_dirname = "/boot/grub/i386-pc";
static const char* grub_cfg = "grub.cfg"; static const char* grub_cfg = "grub.cfg";
static const char* syslinux_cfg[] = { "isolinux.cfg", "syslinux.cfg", "extlinux.conf" }; static const char* syslinux_cfg[] = { "isolinux.cfg", "syslinux.cfg", "extlinux.conf" };
static const char* arch_cfg[] = { "archiso_sys32.cfg", "archiso_sys64.cfg" };
static const char* isolinux_tmp = ".\\isolinux.tmp"; static const char* isolinux_tmp = ".\\isolinux.tmp";
static const char* isolinux_bin[] = { "isolinux.bin", "boot.bin" }; static const char* isolinux_bin[] = { "isolinux.bin", "boot.bin" };
static const char* pe_dirname[] = { "/i386", "/minint" }; static const char* pe_dirname[] = { "/i386", "/minint" };
@ -158,6 +160,15 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t i_file_length, cons
props->is_old_c32[i] = TRUE; props->is_old_c32[i] = TRUE;
} }
// Check for ArchLinux derivatives config files
if (!scan_only) {
for (i = 0; i<ARRAYSIZE(arch_cfg); i++) {
if (safe_stricmp(psz_basename, arch_cfg[i]) == 0) {
props->is_arch_cfg = TRUE;
}
}
}
// Check for GRUB artifacts // Check for GRUB artifacts
if (scan_only) { if (scan_only) {
if (safe_stricmp(psz_dirname, grub_dirname) == 0) if (safe_stricmp(psz_dirname, grub_dirname) == 0)
@ -260,11 +271,12 @@ static void fix_config(const char* psz_fullpath, const char* psz_path, const cha
// Workaround for config files requiring an ISO label for kernel append that may be // Workaround for config files requiring an ISO label for kernel append that may be
// different from our USB label. Oh, and these labels must have spaces converted to \x20. // different from our USB label. Oh, and these labels must have spaces converted to \x20.
if ((props->is_syslinux_cfg) || (props->is_grub_cfg)) { if ((props->is_syslinux_cfg) || (props->is_grub_cfg) || (props->is_arch_cfg)) {
iso_label = replace_char(img_report.label, ' ', "\\x20"); iso_label = replace_char(img_report.label, ' ', "\\x20");
usb_label = replace_char(img_report.usb_label, ' ', "\\x20"); usb_label = replace_char(img_report.usb_label, ' ', "\\x20");
if ((iso_label != NULL) && (usb_label != NULL)) { if ((iso_label != NULL) && (usb_label != NULL)) {
if (replace_in_token_data(src, (props->is_syslinux_cfg) ? "append" : "linuxefi", iso_label, usb_label, TRUE) != NULL) if (replace_in_token_data(src, (props->is_grub_cfg) ? "linuxefi" : "append",
iso_label, usb_label, TRUE) != NULL)
uprintf(" Patched %s: '%s' ⇨ '%s'\n", src, iso_label, usb_label); uprintf(" Patched %s: '%s' ⇨ '%s'\n", src, iso_label, usb_label);
} }
safe_free(iso_label); safe_free(iso_label);
@ -451,7 +463,7 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha
// The drawback however is with cancellation. With a large file, CloseHandle() // The drawback however is with cancellation. With a large file, CloseHandle()
// may take forever to complete and is not interruptible. We try to detect this. // may take forever to complete and is not interruptible. We try to detect this.
ISO_BLOCKING(safe_closehandle(file_handle)); ISO_BLOCKING(safe_closehandle(file_handle));
if (props.is_syslinux_cfg || props.is_grub_cfg) if (props.is_syslinux_cfg || props.is_grub_cfg || props.is_arch_cfg)
fix_config(psz_sanpath, psz_path, psz_basename, &props); fix_config(psz_sanpath, psz_path, psz_basename, &props);
safe_free(psz_sanpath); safe_free(psz_sanpath);
} }
@ -594,7 +606,7 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path)
uprintf(" Could not set timestamp: %s", WindowsErrorString()); uprintf(" Could not set timestamp: %s", WindowsErrorString());
} }
ISO_BLOCKING(safe_closehandle(file_handle)); ISO_BLOCKING(safe_closehandle(file_handle));
if (props.is_syslinux_cfg || props.is_grub_cfg) if (props.is_syslinux_cfg || props.is_grub_cfg || props.is_arch_cfg)
fix_config(psz_sanpath, psz_path, psz_basename, &props); fix_config(psz_sanpath, psz_path, psz_basename, &props);
safe_free(psz_sanpath); safe_free(psz_sanpath);
} }

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.11.985" CAPTION "Rufus 2.11.986"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,11,985,0 FILEVERSION 2,11,986,0
PRODUCTVERSION 2,11,985,0 PRODUCTVERSION 2,11,986,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.11.985" VALUE "FileVersion", "2.11.986"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.11.985" VALUE "ProductVersion", "2.11.986"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"