handle auto in fstabs sanely but be careful about it (#67120)

1 files changed, 12 insertions, 2 deletions

diff --git a/fsset.py b/fsset.py
index 5534f05e8..af254a51a 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1828,7 +1828,6 @@ def readFstab (path):
         fsystem = fileSystemTypeGet(fields[2])
         label = None
 
-
 	if fields[0] == "none":
             device = Device()
         elif len(fields) >= 6 and fields[0].startswith('LABEL='):
@@ -1860,7 +1859,18 @@ def readFstab (path):
             device = makeDevice(fields[0][5:])
 	else:
             continue
-        
+
+        # if they have a filesystem being mounted as auto, we need
+        # to sniff around a bit to figure out what it might be
+        # if we fail at all, though, just ignore it
+        if fsystem == "auto" and device.getDevice() != "none":
+            try:
+                tmp = partedUtils.sniffFilesystemType("/dev/%s" %(device.setupDevice(),))
+                if tmp is not None:
+                    fsystem = tmp
+            except:
+                pass
+
         entry = FileSystemSetEntry(device, fields[1], fsystem, fields[3],
                                    origfsystem=fsystem)
         if label: