Use lsblk to attempt to guess partition's fs type

If not found it will fall back to other tools.

Note that fs_type function is not expected to return a non-zero error
code even if it failed to detect the type.

If filesystem is undetermined then "NOT-DETECTED" will be echoed.

This change will prevent mount hanging on extended partitions (#768902).

Signed-off-by: Philippe Coval <rzr@gna.org>
Tweaked-by: Colin Watson <cjwatson@debian.org>
Bug-Debian: 768902

diff --git a/common.sh b/common.sh
index 98d39fa..a57e2a4 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -103,14 +103,24 @@ item_in_dir () {
 # We can't always tell the filesystem type up front, but if we have the
 # information then we should use it. Note that we can't use block-attr here
 # as it's only available in udebs.
+# If not detected after different attempts then "NOT-DETECTED" will be printed
+# because function is not supposed to exit error codes.
 fs_type () {
+       local fstype=""
        if (export PATH="/lib/udev:$PATH"; type vol_id) >/dev/null 2>&1; then
-               PATH="/lib/udev:$PATH" vol_id --type "$1" 2>/dev/null
-       elif type blkid >/dev/null 2>&1; then
-               blkid -o value -s TYPE "$1" 2>/dev/null
-       else
-               return 0
+               PATH="/lib/udev:$PATH" \
+                       fstype=$(vol_id --type "$1" 2>/dev/null || true)
+               [ -z "$fstype" ] || { echo "$fstype"; return; }
+       fi
+       if type lsblk >/dev/null 2>&1 ; then
+               fstype=$(lsblk --nodeps --noheading --output FSTYPE -- "$1" || true)
+               [ -z "$fstype" ] || { echo "$fstype"; return; }
+       fi
+       if type blkid >/dev/null 2>&1; then
+               fstype=$(blkid -o value -s TYPE "$1" 2>/dev/null || true)
+               [ -z "$fstype" ] || { echo "$fstype"; return; }
        fi
+       echo "NOT-DETECTED"
 }
 
 is_dos_extended_partition() {

diff --git a/debian/changelog b/debian/changelog
index d3bd37b..c72c0cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ os-prober (1.72) UNRELEASED; urgency=medium
   * Add os-release support (based loosely on a patch by Török Edwin; closes:
     #794409).
   * Add Devuan detection (thanks, David Hare; closes: #801631).
+  * Work harder to avoid trying to mount extended partitions (thanks,
+    Philippe Coval; closes: #784709).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Dec 2016 17:11:49 +0000
 

diff --git a/linux-boot-probes/common/50mounted-tests b/linux-boot-probes/common/50mounted-tests
index bb7e005..01bca81 100755 (executable)
--- a/linux-boot-probes/common/50mounted-tests
+++ b/linux-boot-probes/common/50mounted-tests
@@ -21,7 +21,7 @@ do_unmount() {
 
 partition="$1"
 
-types="$(fs_type "$partition")" || types=NOT-DETECTED
+types="$(fs_type "$partition")"
 if [ "$types" = NOT-DETECTED ]; then
        debug "$1 type not recognised; skipping"
        exit 0

diff --git a/os-probes/common/50mounted-tests b/os-probes/common/50mounted-tests
index f2a007d..779c3c3 100755 (executable)
--- a/os-probes/common/50mounted-tests
+++ b/os-probes/common/50mounted-tests
@@ -19,7 +19,7 @@ do_unmount() {
        rmdir "$tmpmnt" || true
 }
 
-types="$(fs_type "$partition")" || types=NOT-DETECTED
+types="$(fs_type "$partition")"
 if [ "$types" = NOT-DETECTED ]; then
        debug "$1 type not recognised; skipping"
        exit 0