/tmp/cleanup wasn't used in 7.2 anyway...

3 files changed, 1 insertions, 32 deletions

diff --git a/image.py b/image.py
index c17cdaf5d..17a802bb8 100644
--- a/image.py
+++ b/image.py
@@ -25,11 +25,6 @@ class ImageInstallMethod(InstallMethod):
     def mergeFullHeaders(self, hdlist):
 	hdlist.mergeFullHeaders(self.tree + "/RedHat/base/hdlist2")
 
-    def writeCleanupPath(self, f):
-	isys.makeDevInode("loop0", "/tmp/loop0")
-	f.write("umount /mnt/runtime\n")
-	f.write("lounsetup /tmp/loop0\n")
-
     def __init__(self, tree):
 	InstallMethod.__init__(self)
 	self.tree = tree
@@ -155,14 +150,6 @@ class CdromInstallMethod(ImageInstallMethod):
 	except SystemError:
 	    pass
 
-    def writeCleanupPath(self, f):
-	isys.makeDevInode("loop0", "/tmp/loop0")
-	isys.makeDevInode(self.device, "/tmp/cdrom")
-	f.write("umount /mnt/runtime\n")
-	f.write("lounsetup /tmp/loop0\n")
-	f.write("umount /mnt/source\n")
-	f.write("eject /tmp/cdrom\n")
-
     def __init__(self, url, messageWindow, progressWindow):
 	(self.device, tree) = string.split(url, "/", 1)
 	self.messageWindow = messageWindow
@@ -259,14 +246,6 @@ class NfsIsoInstallMethod(NfsInstallMethod):
     def filesDone(self):
 	self.umountImage()
 
-    def writeCleanupPath(self, f):
-	isys.makeDevInode("loop0", "/tmp/loop0")
-	isys.makeDevInode("loop1", "/tmp/loop0")
-	f.write("umount /mnt/runtime\n")
-	f.write("lounsetup /tmp/loop0\n")
-	f.write("umount /mnt/source2\n")
-	f.write("lounsetup /tmp/loop1\n")
-
     def __init__(self, tree, messageWindow):
 	self.imageMounted = None
 	self.isoPath = tree
diff --git a/installmethod.py b/installmethod.py
index 97d28e49d..a4441dfef 100644
--- a/installmethod.py
+++ b/installmethod.py
@@ -1,8 +1,5 @@
 class InstallMethod:
 
-    def writeCleanupPath(self, f):
-	pass
-
     def protectedPartitions(self):
         return None
 
diff --git a/packages.py b/packages.py
index 0c527f2bf..920733ac2 100644
--- a/packages.py
+++ b/packages.py
@@ -676,7 +676,7 @@ def doPostInstall(method, id, intf, instPath):
 	return
     
     w = intf.progressWindow(_("Post Install"),
-                            _("Performing post install configuration..."), 7)
+                            _("Performing post install configuration..."), 5)
 
     upgrade = id.upgrade.get()
     arch = iutil.getArch ()
@@ -789,13 +789,6 @@ def doPostInstall(method, id, intf, instPath):
 
         w.set(5)
 
-	if flags.setupFilesystems:
-	    f = open("/tmp/cleanup", "w")
-	    method.writeCleanupPath(f)
-	    f.close()
-
-	w.set(6)
-
     finally:
 	pass