[Mageia-dev] [soft-commits] [2922] fix isolinux.bin (syslinux 4)

[Anne Nicolas]

2012/2/8 Thierry Vignaud <thierry.vignaud at gmail.com>:
> On 8 February 2012 16:45,  <root at mageia.org> wrote:
>> Revision 2922 Author ennael Date 2012-02-08 16:45:34 +0100 (Wed, 08 Feb
>> 2012)
>>
>> Log Message
>>
>> fix isolinux.bin (syslinux 4)
>
> What was the issue?

In previous syslinux version, isolinux.bin was common for 32 and 64
bits arch then calling proper code for both arch. syslinux 4 comes
with 2 different binaries isolinux.bin for both arch
(isolinux-i576.bin and isolinux-x86_64.bin)

>
>> Modified: drakx/trunk/images/make_boot_img
>> ===================================================================
>> --- drakx/trunk/images/make_boot_img  2012-02-07 22:39:03 UTC (rev 2921)
>> +++ drakx/trunk/images/make_boot_img  2012-02-08 15:45:34 UTC (rev 2922)
>> @@ -13,8 +13,11 @@
>>  my $default_acpi = '';
>>  my $default_vga = "vga=788 splash=silent";
>>  my $timeout = 150;
>> -my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin';
>>  my $lib = $arch eq 'x86_64' ? 'lib64' : 'lib';
>> +my $isolinux_bin = '/usr/lib/syslinux/isolinux-i586.bin';
>> +if ($arch eq 'x86_64') {
>> +     $isolinux_bin = '/usr/lib/syslinux/isolinux-x86_64.bin';
>> +}



-- 
Anne
http://www.mageia.org