restore fstab if we started to migrate and found there was not enough space to upgrade

1 files changed, 10 insertions, 0 deletions

diff --git a/fsset.py b/fsset.py
index 1f549294e..cd79dae53 100644
--- a/fsset.py
+++ b/fsset.py
@@ -321,6 +321,11 @@ class ext2FileSystem(extFileSystem):
             raise RuntimeError, ("Trying to migrate ext2 to something other "
                                  "than ext3")
 
+        # if journal already exists skip
+        if isys.ext2HasJournal(devicePath, makeDevNode = 0):
+            log("Skipping migration of %s, has a journal already.\n" % devicePath)
+            return
+
         rc = iutil.execWithRedirect("/usr/sbin/tune2fs",
                                     ["tunefs", "-j", devicePath ],
                                     stdout = "/dev/tty5",
@@ -584,6 +589,11 @@ class FileSystemSet:
         open (prefix + "/etc/mtab", "w+")
         f.close ()
 
+    def restoreMigratedFstab(self, prefix):
+        fname = prefix + "/etc/fstab"
+        if os.access(fname + ".rpmsave", os.R_OK):
+            os.rename(fname + ".rpmsave", fname)
+
     def migratewrite(self, prefix):
         fname = prefix + "/etc/fstab"
         f = open (fname, "r")