From 59139c81890757f4bf4e42cc9cafb272c822f5c6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 1 Dec 2008 11:04:33 +0000 Subject: - do allow to upgrade Mandrakelinux (regression introduced in 10.14) (bug tested on Mandrakelinux LE 2005) (regression introduced in r239304 2008-03-13) --- perl-install/install/NEWS | 1 + perl-install/install/any.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 26a1bd540..ef8511762 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- do allow to upgrade Mandrakelinux (regression introduced in 10.14) - handle new driver: o network: et131x, smsc95xx - fix detecting SMP (was broken we relied on install kernel being non-smp) (#44825) diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 5a1ab159e..9aef4699e 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -936,7 +936,7 @@ sub generate_automatic_stage1_params { sub find_root_parts { my ($fstab, $prefix) = @_; - grep { $_->{release} =~ /\b(mandrake|mandriva|conectiva)\b/i } + grep { $_->{release} =~ /\b(mandrake|mandrakelinux|mandriva|conectiva)\b/i } _find_root_parts($fstab, $prefix); } -- cgit v1.2.1