summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-31 11:33:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-31 11:33:52 +0000
commitb4326368fb2a3aadbdba591b26743fdcd4b911a5 (patch)
tree007454378758f534cae690691c81c3ca4c4f4108
parent4ae270b392fe2b15d558ed722d2a798ddd6398bf (diff)
downloaddrakx-backup-do-not-use-b4326368fb2a3aadbdba591b26743fdcd4b911a5.tar
drakx-backup-do-not-use-b4326368fb2a3aadbdba591b26743fdcd4b911a5.tar.gz
drakx-backup-do-not-use-b4326368fb2a3aadbdba591b26743fdcd4b911a5.tar.bz2
drakx-backup-do-not-use-b4326368fb2a3aadbdba591b26743fdcd4b911a5.tar.xz
drakx-backup-do-not-use-b4326368fb2a3aadbdba591b26743fdcd4b911a5.zip
set isUpgrade to conectiva when we found a conectiva release file
-rw-r--r--perl-install/install_steps_interactive.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2fcddce05..1ebe1319f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -163,6 +163,8 @@ sub selectInstallClass {
log::l("choosing to upgrade partition $p->{part}{device}");
$o->{migrate_device_names} = install_any::use_root_part($o->{all_hds}, $p->{part}, $o);
}
+
+ #- handle encrypted partitions (esp. /home)
foreach (grep { $_->{mntpoint} } @{$o->{fstab}}) {
my ($options, $_unknown) = fs::mount_options::unpack($_);
$options->{encrypted} or next;
@@ -170,7 +172,9 @@ sub selectInstallClass {
[ { label => N("Encryption key for %s", $_->{mntpoint}),
hidden => 1, val => \$_->{encrypt_key} } ]);
}
- $o->{isUpgrade} = $p->{release_file} =~ /redhat/ ? 'redhat' : 'mandrake';
+
+ $o->{isUpgrade} = (find { $p->{release_file} =~ /$_/ } 'mandriva', 'mandrake', 'conectiva', 'redhat') || 'unknown';
+ log::l("upgrading $o->{isUpgrade} distribution");
}
}
}