diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-12-01 11:04:33 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-12-01 11:04:33 +0000 |
| commit | 59139c81890757f4bf4e42cc9cafb272c822f5c6 (patch) | |
| tree | 59cb8056de91b3cba29742e9cbc02bbffb0b3838 | |
| parent | f3cc561885ab890ee59ce020ded2984e5c289113 (diff) | |
| download | drakx-59139c81890757f4bf4e42cc9cafb272c822f5c6.tar drakx-59139c81890757f4bf4e42cc9cafb272c822f5c6.tar.gz drakx-59139c81890757f4bf4e42cc9cafb272c822f5c6.tar.bz2 drakx-59139c81890757f4bf4e42cc9cafb272c822f5c6.tar.xz drakx-59139c81890757f4bf4e42cc9cafb272c822f5c6.zip | |
- do allow to upgrade Mandrakelinux (regression introduced in 10.14)
(bug tested on Mandrakelinux LE 2005)
(regression introduced in r239304 2008-03-13)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 |
2 files changed, 2 insertions, 1 deletions
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); } |