From 258c01ece5a757b96e1bd3a33672a82e75851035 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 26 May 2004 13:40:44 +0000
Subject: /etc/mandrake-release is now /etc/mandrakelinux-release

---
 perl-install/common.pm      | 2 +-
 perl-install/crypto.pm      | 2 +-
 perl-install/install_any.pm | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/perl-install/common.pm b/perl-install/common.pm
index 170ad831d..89d2ca4ac 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -259,7 +259,7 @@ sub set_permissions {
 }
 
 sub mandrake_release() {
-    chomp_(cat_("/etc/mandrake-release"))
+    chomp_(cat_("/etc/mandrakelinux-release"))
 }
 
 sub require_root_capability() {
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 7cd0b2447..c9679c736 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -105,7 +105,7 @@ sub bestMirror {
 #- hack to retrieve Mandrakelinux version...
 sub version() {
     require pkgs;
-    my $pkg = pkgs::packageByName($::o->{packages}, 'mandrake-release');
+    my $pkg = pkgs::packageByName($::o->{packages}, 'mandrakelinux-release');
     $pkg && $pkg->version || '9.1'; #- safe but dangerous ;-)
 }
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 735465811..7806cdc3c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -957,8 +957,9 @@ sub find_root_parts {
     my ($fstab, $prefix) = @_;
     map { 
 	my $handle = any::inspect($_, $prefix);
-	my $s = $handle && cat_("$handle->{dir}/etc/mandrake-release");
-	if ($s) {
+	my $f = $handle && (find { -f $_ } map { "$handle->{dir}/etc/$_" } 'mandrake-release', 'mandrakelinux-release');
+	if ($f) {
+	    my $s = cat_($f);
 	    chomp($s);
 	    $s =~ s/\s+for\s+\S+//;
 	    log::l("find_root_parts found $_->{device}: $s");
-- 
cgit v1.2.1