summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-13 14:58:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-13 14:58:37 +0000
commitd9b3ca50a7f1dba46efe4c9d5c2d98f308ad6a79 (patch)
tree4dd03c166278a09df4c8951b81be0fba36941b6a
parent6b9e889257fb9205372aba8da5004a6e912b9eb5 (diff)
downloaddrakx-d9b3ca50a7f1dba46efe4c9d5c2d98f308ad6a79.tar
drakx-d9b3ca50a7f1dba46efe4c9d5c2d98f308ad6a79.tar.gz
drakx-d9b3ca50a7f1dba46efe4c9d5c2d98f308ad6a79.tar.bz2
drakx-d9b3ca50a7f1dba46efe4c9d5c2d98f308ad6a79.tar.xz
drakx-d9b3ca50a7f1dba46efe4c9d5c2d98f308ad6a79.zip
- do not allow to upgrade i586->x86_64 or x86_64->i586 (#33370)
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_interactive.pm10
2 files changed, 11 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 51dc386f9..ab95a0fdc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- do not allow to upgrade i586->x86_64 or x86_64->i586 (#33370)
- do not configure "windows" bootloader entries for "hidden" partitions
- fix unwrapped label (#33243)
- fix grub hanging if /boot on xfs (#33267)
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index b32c1fe8e..0be070e22 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -124,6 +124,7 @@ sub selectInstallClass {
$_->{release} .= " ($_->{part}{device})" foreach @l;
}
+ askInstallClass:
my $p;
$o->ask_from_({ title => N("Install/Upgrade"),
messages => N("Is this an install or an upgrade?"),
@@ -135,6 +136,15 @@ sub selectInstallClass {
format => sub { ref($_[0]) ? N("Upgrade %s", $_[0]{release}) : translate($_[0]) }
} ]);
if (ref $p) {
+ if (arch() =~ /x86_64/ && $p->{arch} eq 'i586') {
+ $o->ask_warn('', N("Upgrade from a 32bit to a 64bit distribution is not supported"));
+ goto askInstallClass;
+ }
+ if (arch() =~ /i.86/ && $p->{arch} eq 'x86_64') {
+ $o->ask_warn('', N("Upgrade from a 64bit to a 32bit distribution is not supported"));
+ goto askInstallClass;
+ }
+
if ($p->{part}) {
log::l("choosing to upgrade partition $p->{part}{device}");
$o->{migrate_device_names} = install::any::use_root_part($o->{all_hds}, $p->{part}, $o);