[PATCH] 470951 - be more careful around xfs

[Chris Lumens <clumens redhat com>]

We don't try to make xfs filesystems on the livecd because the tools
aren't there, but we still try to label already existing ones.  We
should stop doing that.

- Chris


diff --git a/fsset.py b/fsset.py
index 40eb0d2..e216d9a 100644
--- a/fsset.py
+++ b/fsset.py
@@ -381,7 +381,7 @@ class xfsFileSystem(FileSystemType):
         self.maxSizeMB = 16 * 1024 * 1024
         self.maxLabelChars = 12
         self.supported = -1
-        if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs"):
+        if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/xfs_admin"):
             self.supported = 0
 
         self.packages = [ "xfsprogs" ]
@@ -1874,9 +1874,10 @@ MAILADDR root
                 label = isys.readFSLabel(dev)
             except:
                 continue
+
             if label:
                 entry.setLabel(label)
-            else:
+            elif entry.fsystem.isSupported():
                 self.labelEntry(entry, chroot)
 
     def haveMigratedFilesystems(self):