- allow users to use their own mke2fs.conf

2 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2dabd5adb..f7352fa39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Peter Jones  <pjones@redhat.com>
+
+	* fsset.py (ext2FormatFilesystem): allow users to use their own
+	mke2fs.conf
+
 2007-10-24  Chris Lumens  <clumens@redhat.com>
 
 	* dmraid.py, fsset.py, partedUtils.py, raid.py, isys/isys.py:  Clean
diff --git a/fsset.py b/fsset.py
index 57dd8f294..262ba57a8 100644
--- a/fsset.py
+++ b/fsset.py
@@ -2625,7 +2625,18 @@ def ext2FormatFilesystem(argList, messageFile, windowCreator, mntpoint):
         os.dup2(fd, 2)
         os.close(p[1])
         os.close(fd)
-        os.execvp(argList[0], argList)
+
+        env = os.environ
+        configs = [ "/mnt/source/RHupdates/mke2fs.conf",
+                    "/tmp/updates/mke2fs.conf",
+                    "/etc/mke2fs.conf",
+                  ]
+        for config in configs:
+            if os.access(config, os.R_OK):
+                env['MKE2FS_CONFIG'] = config
+                break
+
+        os.execvpe(argList[0], argList, env)
         log.critical("failed to exec %s", argList)
         os._exit(1)