merge in the generic parts of the xfs changes from sgi and in the process take care of some of our multifsification

1 files changed, 16 insertions, 17 deletions

diff --git a/partitioning.py b/partitioning.py
index 753d4efd9..74bcbecf5 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -1280,23 +1280,24 @@ class DiskSet:
         self.startAllRaid()
 
         for dev, devices, level, numActive in self.mdList:
-            # XXX multifsify.
-            # XXX NOTE!  reiserfs isn't supported on software raid devices.
-            if not fsset.isValidExt2 (dev):
-                continue
-
-            try:
-                isys.mount(dev, mountpoint, readOnly = 1)
-            except SystemError, (errno, msg):
+            (errno, msg) = (None, None)
+            found = 0
+            for fs in fsset.getFStoTry(dev):
                 try:
-                    isys.mount(dev, mountpoint, "ext3", readOnly = 1)
+                    isys.mount(dev, mountpoint, fs, readOnly = 1)
+                    found = 1
+                    break
                 except SystemError, (errno, msg):
-                    intf.messageWindow(_("Error"),
-                                       _("Error mounting filesystem "
-                                         "on %s: %s") % (dev, msg))
-                    continue
+                    pass
+
+            if not found:
+                intf.messageWindow(_("Error"),
+                                   _("Error mounting filesystem "
+                                     "on %s: %s") % (dev, msg))
+                continue
+
             if os.access (mountpoint + '/etc/fstab', os.R_OK):
-                rootparts.append ((dev, "ext2"))
+                rootparts.append ((dev, fs))
             isys.umount(mountpoint)
 
         self.stopAllRaid()
@@ -1315,9 +1316,7 @@ class DiskSet:
                     # XXX check for raid superblocks on non-autoraid partitions
                     #  (#32562)
                     pass
-                elif part.fs_type and (part.fs_type.name == "ext2"
-                                     or part.fs_type.name == "ext3"
-                                     or part.fs_type.name == "reiserfs"):
+                elif part.fs_type in fsset.getUsableLinuxFs():
                     node = get_partition_name(part)
 		    try:
 			isys.mount(node, mountpoint, part.fs_type.name)