summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-06 04:55:28 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-06 04:55:28 +0000
commit7f0d6a551cdf83e8025ceb14b232820e00027ab8 (patch)
tree2bd4cd9b4bf99c0196bb4b8888e360fe50191b69
parente4bc73e0d75a2e67fedf4db20f169b5e6406b9d0 (diff)
downloaddrakx-7f0d6a551cdf83e8025ceb14b232820e00027ab8.tar
drakx-7f0d6a551cdf83e8025ceb14b232820e00027ab8.tar.gz
drakx-7f0d6a551cdf83e8025ceb14b232820e00027ab8.tar.bz2
drakx-7f0d6a551cdf83e8025ceb14b232820e00027ab8.tar.xz
drakx-7f0d6a551cdf83e8025ceb14b232820e00027ab8.zip
warn that i586 cannot rescue x86_64 (mga#8696)
-rw-r--r--rescue/NEWS1
-rwxr-xr-xrescue/guessmounts3
2 files changed, 4 insertions, 0 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index 0722c5328..849c25f09 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -4,6 +4,7 @@
- include persistant storage udev rules needed to see new uuids
- offer to pick the distro to rescue when there's more than one
- /var/run/utmp is on tmpfs now
+- warn that i586 cannot rescue x86_64 (mga#8696)
Version 1.40 - 6 March 2013 by Thierry Vignaud
diff --git a/rescue/guessmounts b/rescue/guessmounts
index 9b592f07e..3ebc2fee5 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -58,6 +58,7 @@ if (@$raid_parts) {
my @roots;
+my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch();
foreach (@$normal_parts) {
my $dev = devices::make($_->{device});
@@ -72,6 +73,8 @@ foreach (@$normal_parts) {
my $h = common::parse_release_file($target, $release_file, $_);
add2hash($h, { dev => $dev, fs => $fs, fstab => \@fstab,
pretty_name => "$h->{release} $h->{version} $h->{arch} on $dev" });
+ # Offer to rescue only same arch:
+ $h->{pretty_name} .= " (cannot be rescued: $h->{arch} ne $arch;)" if $h->{arch} ne $arch;
push @roots, $h;
}
system('umount', $target) == 0 or die "error unmounting $target\n";