summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-26 13:40:44 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-26 13:40:44 +0000
commit258c01ece5a757b96e1bd3a33672a82e75851035 (patch)
treef09a37c2d8ac1f8e9856ef4265eb38c3ec99da87 /perl-install/install_any.pm
parentb70aabb9d8536e53b0c421e9aae4db720478a388 (diff)
downloaddrakx-258c01ece5a757b96e1bd3a33672a82e75851035.tar
drakx-258c01ece5a757b96e1bd3a33672a82e75851035.tar.gz
drakx-258c01ece5a757b96e1bd3a33672a82e75851035.tar.bz2
drakx-258c01ece5a757b96e1bd3a33672a82e75851035.tar.xz
drakx-258c01ece5a757b96e1bd3a33672a82e75851035.zip
/etc/mandrake-release is now /etc/mandrakelinux-release
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm5
1 files changed, 3 insertions, 2 deletions
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");