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/install_any.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_any.pm')

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