summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
Diffstat (limited to 'rescue')
-rw-r--r--rescue/NEWS3
-rwxr-xr-xrescue/bin/guessmounts6
2 files changed, 6 insertions, 3 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index f3f4f4c47..381194815 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,6 @@
+- guessmount:
+ o just use the fs reported by blkid instead of doing brute force guessing
+
Version 1.63 - 19 March 2020 by Thierry Vignaud
- add more tools for XFS & btrfs
diff --git a/rescue/bin/guessmounts b/rescue/bin/guessmounts
index 07cd62ba3..a4d1fa7f7 100755
--- a/rescue/bin/guessmounts
+++ b/rescue/bin/guessmounts
@@ -62,9 +62,9 @@ my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch()
foreach (@$normal_parts) {
my $dev = devices::make($_->{device});
- my $fs = find {
- system("mount -t $_ $dev $target 2>/dev/null") == 0;
- } fs::type::true_local_fs_types() or next;
+ my $fs = $_->{fs_type};
+ $fs or next; # no need to display an error if there's no fs...
+ system("mount -t $fs $dev $target 2>/dev/null");
if (my $release_file = common::release_file($target)) {
my $release = chomp_(cat_("$target$release_file"));