[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 1/2] Move check for ext2 filesystem journal from FS to Ext2FS.



Even though we only currently support migration of ext[23] we should
keep the ext-specific code out of the base filesystem class.
---
 pyanaconda/storage/formats/fs.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pyanaconda/storage/formats/fs.py b/pyanaconda/storage/formats/fs.py
index a0f2749..7887bd2 100644
--- a/pyanaconda/storage/formats/fs.py
+++ b/pyanaconda/storage/formats/fs.py
@@ -387,12 +387,6 @@ class FS(DeviceFormat):
         if not os.path.exists(self.device):
             raise FSError("device does not exist")
 
-        # if journal already exists skip
-        if isys.ext2HasJournal(self.device):
-            log.info("Skipping migration of %s, has a journal already."
-                     % self.device)
-            return
-
         argv = self._defaultMigrateOptions[:]
         argv.append(self.device)
         try:
@@ -926,6 +920,12 @@ class Ext2FS(FS):
         return msg.strip()
 
     def doMigrate(self, intf=None):
+        # if journal already exists skip
+        if isys.ext2HasJournal(self.device):
+            log.info("Skipping migration of %s, has a journal already."
+                     % self.device)
+            return
+
         FS.doMigrate(self, intf=intf)
         self.tuneFS()
 
-- 
1.7.2.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]