summaryrefslogtreecommitdiffstats
path: root/perl-install
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
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')
-rw-r--r--perl-install/common.pm2
-rw-r--r--perl-install/crypto.pm2
-rw-r--r--perl-install/install_any.pm5
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");