From b51c5a9c5b00c35244cbad23e27fde8f949b5f74 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 23 May 2012 18:28:29 +0000
Subject: default to the higher version when there're several mga roots
 (mga#6003)

---
 rescue/NEWS        | 2 ++
 rescue/guessmounts | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'rescue')

diff --git a/rescue/NEWS b/rescue/NEWS
index 46f368d85..d822eb9ac 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- default to the higher version when there're several mga roots (mga#6003)
+
 Version 1.38 - 11 May 2012, by Thierry Vignaud
 
 - include missing modules when SMB appears in fstab (mga#5850)
diff --git a/rescue/guessmounts b/rescue/guessmounts
index 0f5da6e48..14d7cd804 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -78,6 +78,8 @@ my ($root, $fs, @fstab);
 
 # Try Mageia first:
 if (@roots) {
+    # Order by release number:
+    @roots = sort { $b->{release} cmp $a->{release} } @roots;
     # Then pick mga over mdv:
     @roots = map { @$_ } partition { $_->{release} =~ /Mageia/ } @roots;
     my $selected = first(@roots);
-- 
cgit v1.2.1