[Mageia-dev] [soft-commits] [5525] (mkinitrd) Fix prefix checking in foreign partition check (mga#6966)
Colin Guthrie
mageia at colin.guthr.ie
Sat Sep 1 17:24:29 CEST 2012
'Twas brillig, and Thierry Vignaud at 01/09/12 16:20 did gyre and gimble:
> On 1 September 2012 17:15, Thierry Vignaud <thierry.vignaud at gmail.com> wrote:
>>> (mkinitrd) Fix prefix checking in foreign partition check (mga#6966)
>>
>> Nice spot.
>>
>>> Modified: drakx/trunk/perl-install/bootloader.pm
>>> ===================================================================
>>> --- drakx/trunk/perl-install/bootloader.pm 2012-08-31 23:38:35 UTC (rev
>>> 5524)
>>> +++ drakx/trunk/perl-install/bootloader.pm 2012-09-01 14:40:52 UTC (rev
>>> 5525)
>>> @@ -113,7 +113,7 @@
>>> return $initrd if $::testing # testing mode
>>> || -e "$::prefix/$initrd" # already exists
>>> || $initrd =~ /\(hd/ # unrecognized partition
>>> - || !-d $dir; # dir doesn't exist (probably !mounted
>>> foreign part)
>>> + || !-d "$::prefix/$dir";# dir doesn't exist (probably !mounted
>>> foreign part)
>
> Err, this is not related to bugs mga#6966 which is fixed for long...
I'm just quoted the bug number from the commit where you introduced the
breakage:
commit 908a594b10b966e0a80701262f989b9ca6b0070c
Author: tv <tv at 5b7c3c08-40e5-403b-9995-ace06908e4af>
Date: Tue Aug 7 10:37:22 2012 +0000
(mkinitrd) do not crash if a foreign partition is not mounted (mga#6966)
git-svn-id: svn+ssh://svn.mageia.org/svn/soft/drakx/trunk@5294
5b7c3c08-40e5-403b-9995-ace06908e4af
Col
--
Colin Guthrie
colin(at)mageia.org
http://colin.guthr.ie/
Day Job:
Tribalogic Limited http://www.tribalogic.net/
Open Source:
Mageia Contributor http://www.mageia.org/
PulseAudio Hacker http://www.pulseaudio.org/
Trac Hacker http://trac.edgewall.org/
More information about the Mageia-dev
mailing list