summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-03 14:47:39 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-03 14:47:39 +0000
commitac018681b878b4c324adc77e65adeaaa1edbfa0e (patch)
tree2a528103dc082de58fa1c70876204fde0916d14a
parent9adf29cff172f289f893fe6489566d965fe806fe (diff)
downloaddrakx-backup-do-not-use-ac018681b878b4c324adc77e65adeaaa1edbfa0e.tar
drakx-backup-do-not-use-ac018681b878b4c324adc77e65adeaaa1edbfa0e.tar.gz
drakx-backup-do-not-use-ac018681b878b4c324adc77e65adeaaa1edbfa0e.tar.bz2
drakx-backup-do-not-use-ac018681b878b4c324adc77e65adeaaa1edbfa0e.tar.xz
drakx-backup-do-not-use-ac018681b878b4c324adc77e65adeaaa1edbfa0e.zip
do not offer to upgrade/install in restore mode
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 088b0eb15..3c5959119 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not offer to upgrade/install in restore mode
+
Version 12.77 - 30 October 2009
- fallback on most generic kernel if the suitable one is not available
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index b296702f4..a3336d930 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -125,6 +125,8 @@ sub selectKeyboard {
sub selectInstallClass {
my ($o) = @_;
+ return if $::isRestore;
+
my @l = install::any::find_root_parts($o->{fstab}, $::prefix);
# Don't list other archs as ugrading between archs is not supported
my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch();