forked from pool/syslinux
0620ccce49
%patchN syntax. - Normalize all patches to apply as -p1 + Rebased remove-note-gnu-section.patch + Rebased sysmacros.patch - Rename all *.diff files to *.patch, aligning one a common suffix: + syslinux-4.04-align.diff -> syslinux-4.04-align.patch + syslinux-4.04-cache_fix.diff -> syslinux-4.04-cache_fix.patch + syslinux-4.04-cwd.diff -> syslinux-4.04-cwd.patch + syslinux-4.04-gcc10.diff -> syslinux-4.04-gcc10.patch + syslinux-4.04-gcc47.diff -> syslinux-4.04-gcc47.patch + syslinux-4.04-geometry.diff -> syslinux-4.04-geometry.patch + syslinux-4.04-iso9660.diff -> syslinux-4.04-iso9660.patch + syslinux-4.04-isohybrid_efi.diff -> syslinux-4.04-isohybrid_efi.patch + syslinux-4.04-isohybrid_efi_optional.diff -> syslinux-4.04-isohybrid_efi_optional.patch + syslinux-4.04-isohybrid_mbr.diff -> syslinux-4.04-isohybrid_mbr.patch + syslinux-4.04-libext2fs.diff -> syslinux-4.04-libext2fs.patch + syslinux-4.04-localboot.diff -> syslinux-4.04-localboot.patch + syslinux-4.04-lzo.diff -> syslinux-4.04-lzo.patch + syslinux-4.04-mboot_bootif.diff -> syslinux-4.04-mboot_bootif.patch + syslinux-4.04-md5pass.diff -> syslinux-4.04-md5pass.patch + syslinux-4.04-miniacc.diff -> syslinux-4.04-miniacc.patch + syslinux-4.04-mtime.diff -> syslinux-4.04-mtime.patch + syslinux-4.04-noinitrd.diff -> syslinux-4.04-noinitrd.patch + syslinux-4.04-nostrip.diff -> syslinux-4.04-nostrip.patch + syslinux-4.04-pie.diff -> syslinux-4.04-pie.patch + syslinux-4.04-python3.diff -> syslinux-4.04-python3.patch + syslinux-4.04-timeout.diff -> syslinux-4.04-timeout.patch OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=109
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
Index: syslinux-4.04/core/fs/iso9660/iso9660.c
|
|
===================================================================
|
|
--- syslinux-4.04.orig/core/fs/iso9660/iso9660.c
|
|
+++ syslinux-4.04/core/fs/iso9660/iso9660.c
|
|
@@ -228,14 +228,25 @@ static int iso_readdir(struct file *file
|
|
/* Load the config file, return 1 if failed, or 0 */
|
|
static int iso_load_config(void)
|
|
{
|
|
- static const char *search_directories[] = {
|
|
- "/boot/isolinux",
|
|
- "/isolinux",
|
|
- "/boot/syslinux",
|
|
- "/syslinux",
|
|
- "/",
|
|
- NULL
|
|
- };
|
|
+ /*
|
|
+ * Put search_directories[] to different section so it
|
|
+ * won't be compressed (and we can patch it later).
|
|
+ */
|
|
+ __asm__(
|
|
+ ".section .data16\n"
|
|
+ ".s1: .ascii \"/boot\"\n"
|
|
+ ".s2: .string \"/isolinux\"\n"
|
|
+ ".fill 64, 1, 0\n"
|
|
+ ".s3: .ascii \"/boot\"\n"
|
|
+ ".s4: .string \"/syslinux\"\n"
|
|
+ ".s5: .string \"/\"\n"
|
|
+ ".align 4\n"
|
|
+ "search_directories:\n"
|
|
+ ".long .s1, .s2, .s3, .s4, .s5, 0\n"
|
|
+ ".text\n"
|
|
+ );
|
|
+ extern const char *search_directories[];
|
|
+
|
|
static const char *filenames[] = {
|
|
"isolinux.cfg",
|
|
"syslinux.cfg",
|