diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:28:29 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:28:29 +0000 |
| commit | 6939336bb8f10b2d761fe428da773f5cad71af43 (patch) | |
| tree | 23f953541e658976c429ea0a0abe8609e61fcc13 | |
| parent | 0c05e1139c2c2cdeab8856dfb8f5f282627eee64 (diff) | |
| download | drakx-6939336bb8f10b2d761fe428da773f5cad71af43.tar drakx-6939336bb8f10b2d761fe428da773f5cad71af43.tar.gz drakx-6939336bb8f10b2d761fe428da773f5cad71af43.tar.bz2 drakx-6939336bb8f10b2d761fe428da773f5cad71af43.tar.xz drakx-6939336bb8f10b2d761fe428da773f5cad71af43.zip | |
default to the higher version when there're several mga roots (mga#6003)
| -rw-r--r-- | rescue/NEWS | 2 | ||||
| -rwxr-xr-x | rescue/guessmounts | 2 |
2 files changed, 4 insertions, 0 deletions
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); |