fix mkfs on xfs

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a7118fc8f..ace921bb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-23  Peter Jones  <pjones@redhat.com>
+
+	* fsset.py (xfsFileSystem.formatDevice): Fix mkfs on xfs,
+	from Lars Hamann (#151378)
+
 2005-03-23  Chris Lumens  <clumens@redhat.com>
 
 	* Bump version.
diff --git a/fsset.py b/fsset.py
index 4874e4f38..1ef49520c 100644
--- a/fsset.py
+++ b/fsset.py
@@ -419,9 +419,13 @@ class xfsFileSystem(FileSystemType):
     def formatDevice(self, entry, progress, chroot='/'):
         devicePath = entry.device.setupDevice(chroot)
         
+        xfsBytesPerInode = 2048
+        if entry.bytesPerInode < 2048:
+            xfsBytesPerInode = entry.bytesPerInode
+
         rc = iutil.execWithRedirect("/usr/sbin/mkfs.xfs",
                                     ["mkfs.xfs", "-f", "-l", "internal",
-                                     "-i size=" + str(entry.bytesPerInode),
+                                     "-i", "size=" + str(xfsBytesPerInode),
                                      devicePath ],
                                     stdout = "/dev/tty5",
                                     stderr = "/dev/tty5")