From 347796a242890470c291d1a00508e8d6e5e15921 Mon Sep 17 00:00:00 2001
From: "Slawomir Wojciech Wojtczak (vermaden)" <vermaden@interia.pl>
Date: Mon, 26 Jan 2015 19:12:46 +0100
Subject: [PATCH] Introduce smarter fstype() function to better determine
 filesystem. New automount-1.5.2.tar.gz tarball.

---
 automount              | 116 +++++++++++++++++++++++++++++------------
 automount-1.5.2.tar.gz | Bin 0 -> 4868 bytes
 2 files changed, 83 insertions(+), 33 deletions(-)
 create mode 100644 automount-1.5.2.tar.gz

diff --git a/automount b/automount
index 0400500..2e8c9bd 100755
--- a/automount
+++ b/automount
@@ -265,6 +265,58 @@ __random_wait() {
   __log "${DEV}: random wait for '${WAIT}' seconds before 'attach' action"
 }
 
+__fstype() { # 1=DEV
+  TYPE=$( dd < ${DEV} count=1 2> /dev/null | strings | head -1 )
+  if echo "${TYPE}" | grep -q 'EXFAT'
+  then
+    TYPE=EXFAT
+    return
+  fi
+  TYPE=''
+  TYPE=$( file -r -b -L -s ${DEV} | sed -E 's/label:\ \".*\"//g' )
+  if echo "${TYPE}" | grep -q 'Unix Fast File'
+  then
+    TYPE=UFS
+    return
+  fi
+  if echo "${TYPE}" | grep -q 'ext2'
+  then
+    TYPE=EXT2
+    return
+  fi
+  if echo "${TYPE}" | grep -q 'ext3'
+  then
+    TYPE=EXT3
+    return
+  fi
+  if echo "${TYPE}" | grep -q 'ext4'
+  then
+    TYPE=EXT4
+    return
+  fi
+  if echo "${TYPE}" | grep -q 'DOS/MBR boot sector'
+  then
+    TYPE=$( file -r -k -b -L -s ${DEV} | sed -E 's/label:\ \".*\"//g' )
+    if echo "${TYPE}" | grep -q 'Unix Fast File'
+    then
+      TYPE=UFS
+      return
+    fi
+    if echo "${TYPE}" | grep -q 'FAT'
+    then
+      TYPE=FAT
+      return
+    fi
+    if echo "${TYPE}" | grep -q 'NTFS'
+    then
+      TYPE=NTFS
+      return
+    fi
+  fi
+  TYPE=-1
+  return
+}
+
 DEV=/dev/${1}
 
 __wait_for_boot
@@ -294,8 +346,27 @@ case ${2} in
       OPTS="-o noatime"
     fi
     __wait_for_device ${DEV}
-    case $( file -k -b -L -s ${DEV} | sed -E 's/label:\ \".*\"//g' ) in
-      (*FAT*) # must be before NTFS section because: newfs_msdos -O NTFS -L NTFS
+    __fstype ${DEV}
+    case ${TYPE} in
+      (UFS)
+        __create_mount_point ${DEV}
+        __wait_for_device ${DEV}
+        fsck_ufs -C -y ${DEV} \
+          | while read LINE
+            do
+              __log "${DEV}: fsck_ufs ${LINE}"
+            done
+        __wait_for_device ${DEV}
+        if mount -t ufs ${OPTS} ${DEV} ${MNT}
+        then
+          ADD=1
+        else
+          __log "${DEV}: mount failed (ufs) 'mount -t ufs ${OPTS} ${DEV} ${MNT}'"
+          exit 1
+        fi
+        __log "${DEV}: mount (ufs)"
+        ;;
+      (FAT) # must be before NTFS section because: newfs_msdos -O NTFS -L NTFS
         __create_mount_point ${DEV}
         __wait_for_device ${DEV}
         fsck_msdosfs -C -y ${DEV} \
@@ -314,7 +385,7 @@ case ${2} in
         fi
         __log "${DEV}: mount (fat)"
         ;;
-      (*NTFS*) # must be after FAT section: newfs_msdos -O NTFS -L NTFS
+      (NTFS) # must be after FAT section: newfs_msdos -O NTFS -L NTFS
         __create_mount_point ${DEV}
         __wait_for_device ${DEV}
         if which ntfs-3g 1> /dev/null 2> /dev/null # sysutils/fusefs-ntfs
@@ -348,7 +419,7 @@ case ${2} in
         fi
         __log "${DEV}: mount (ntfs)"
         ;;
-      (*ext2*)
+      (EXT2)
         __create_mount_point ${DEV}
         __wait_for_device ${DEV}
         e2fsck -y ${DEV} \
@@ -366,7 +437,7 @@ case ${2} in
         fi
         __log "${DEV}: mount (ext2)"
         ;;
-      (*ext3*)
+      (EXT3)
         __create_mount_point ${DEV}
         __wait_for_device ${DEV}
         e2fsck -y ${DEV} \
@@ -384,7 +455,7 @@ case ${2} in
         fi
         __log "${DEV}: mount (ext3)"
         ;;
-      (*ext4*)
+      (EXT4)
         __create_mount_point ${DEV}
         __wait_for_device ${DEV}
         e2fsck -y ${DEV} \
@@ -402,42 +473,21 @@ case ${2} in
         fi
         __log "${DEV}: mount (ext4)"
         ;;
-      (*Unix\ Fast\ File*)
+      (EXFAT)
         __create_mount_point ${DEV}
         __wait_for_device ${DEV}
-        fsck_ufs -C -y ${DEV} \
-          | while read LINE
-            do
-              __log "${DEV}: fsck_ufs ${LINE}"
-            done
-        __wait_for_device ${DEV}
-        if mount -t ufs ${OPTS} ${DEV} ${MNT}
+        if mount.exfat ${OPTS} ${DEV} ${MNT} # sysutils/fusefs-exfat
         then
           ADD=1
         else
-          __log "${DEV}: mount failed (ufs) 'mount -t ufs ${OPTS} ${DEV} ${MNT}'"
+          __log "${DEV}: mount failed (exfat) 'mount.exfat ${OPTS} ${DEV} ${MNT}'"
           exit 1
         fi
-        __log "${DEV}: mount (ufs)"
+        __log "${DEV}: mount (exfat)"
         ;;
       (*)
-        case $( dd < ${DEV} count=1 2> /dev/null | strings | head -1 ) in
-          (*EXFAT*)
-            __create_mount_point ${DEV}
-            __wait_for_device ${DEV}
-            if mount.exfat ${OPTS} ${DEV} ${MNT} # sysutils/fusefs-exfat
-            then
-              ADD=1
-            else
-              __log "${DEV}: mount failed (exfat) 'mount.exfat ${OPTS} ${DEV} ${MNT}'"
-              exit 1
-            fi
-            __log "${DEV}: mount (exfat)"
-            ;;
-          (*)
-            __log "${DEV}: filesystem not supported or no filesystem"
-            exit 0
-        esac
+        __log "${DEV}: filesystem not supported or no filesystem"
+        exit 0
         ;;
     esac
     if [ ${ADD} -eq 1 ]
diff --git a/automount-1.5.2.tar.gz b/automount-1.5.2.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..eab282b1e7242ff15b954ce884fc726f3e6f3417
GIT binary patch
literal 4868
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

literal 0
HcmV?d00001