diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-13 09:24:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-13 09:24:20 +0000 |
| commit | 45fb3f6b0be0b79a1c00d6da8c9ac21932070da9 (patch) | |
| tree | 8ae55d7884beb685430cb3ceb9c5a68c7a334623 | |
| parent | 3399bb433c44191e52445e38601470c53b0fcd7b (diff) | |
| download | drakx-45fb3f6b0be0b79a1c00d6da8c9ac21932070da9.tar drakx-45fb3f6b0be0b79a1c00d6da8c9ac21932070da9.tar.gz drakx-45fb3f6b0be0b79a1c00d6da8c9ac21932070da9.tar.bz2 drakx-45fb3f6b0be0b79a1c00d6da8c9ac21932070da9.tar.xz drakx-45fb3f6b0be0b79a1c00d6da8c9ac21932070da9.zip | |
- do not propose to upgrade non-mandriva and non-conectiva distros (#38408)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 08cf8ccaa..2347df89e 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - really fix partition device name for some dmraid (missing "p", cf #38363) - cpufreq: fix gsx-suspmod probe +- do not propose to upgrade non-mandriva and non-conectiva distros (#38408) Version 10.10 - 6 March 2008 diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index da61cc957..a663d30f3 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -940,6 +940,13 @@ sub generate_automatic_stage1_params { sub find_root_parts { my ($fstab, $prefix) = @_; + grep { $_->{release} =~ /\b(mandrake|mandriva|conectiva)\b/i } + _find_root_parts($fstab, $prefix); +} + +sub _find_root_parts { + my ($fstab, $prefix) = @_; + if ($::local_install) { my $f = common::release_file('/mnt') or return; return common::parse_release_file('/mnt', $f, {}); |