From 45fb3f6b0be0b79a1c00d6da8c9ac21932070da9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 13 Mar 2008 09:24:20 +0000
Subject: - do not propose to upgrade non-mandriva and non-conectiva distros
 (#38408)

---
 perl-install/install/NEWS   | 1 +
 perl-install/install/any.pm | 7 +++++++
 2 files changed, 8 insertions(+)

(limited to 'perl-install')

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, {});
-- 
cgit v1.2.1