Browse Source

Fixed a harmless bug introduced with rev 1111.

release-1.5.4.branch
Thomas Schmitt 7 years ago
parent
commit
2c2fb7caf2
  1. 2
      doc/boot_sectors.txt
  2. 4
      libisofs/system_area.c

2
doc/boot_sectors.txt

@ -956,7 +956,7 @@ in the ISO image [without causing overlapping between partitions].
Sources:
cdrkit-1.1.10/genisoimage/boot-hppa.c
by Steve McIntyre <steve@einval.com>
who states "Heavily inspired by palo"
who states "Heavily inspired by palo"
There are five parameters which get encoded into the first 248 bytes of the
System Area: cmdline, bootloader, 32-bit kernel, 64-bit kernel, and ramdisk.

4
libisofs/system_area.c

@ -799,7 +799,7 @@ static int hppa_palo_get_filepar(Ecma119Image *t, char *path,
*
* learned from cdrkit-1.1.10/genisoimage/boot-hppa.c
* by Steve McIntyre <steve@einval.com>
* who states "Heavily inspired by palo"
* who states "Heavily inspired by palo"
* Public mail conversations with Helge Deller, beginning with
* https://lists.debian.org/debian-hppa/2014/01/msg00016.html
* http://git.kernel.org/cgit/linux/kernel/git/deller/palo.git/tree/lib/
@ -815,7 +815,7 @@ static int make_hppa_palo_sector(Ecma119Image *t, uint8_t *buf, int hdrversion,
img = t->image;
if (img->hppa_cmdline == NULL && img->hppa_bootloader == NULL &&
img->hppa_kernel_32 == NULL && img->hppa_kernel_64 &&
img->hppa_kernel_32 == NULL && img->hppa_kernel_64 == NULL &&
img->hppa_ramdisk == NULL)
return ISO_SUCCESS;
if (img->hppa_cmdline == NULL || img->hppa_bootloader == NULL ||

Loading…
Cancel
Save