fix upgrades

1 files changed, 8 insertions, 41 deletions

diff --git a/todo.py b/todo.py
index dee739114..461d11631 100644
--- a/todo.py
+++ b/todo.py
@@ -661,9 +661,8 @@ class ToDo:
                                             _("Error mounting ext2 filesystem on %s: %s") % (dev, msg))
                     continue
                 if os.access ('/mnt/sysimage/etc/fstab', os.R_OK):
-                    rootparts.append ((dev, "ext2"))
+                    rootparts.append (dev)
                 isys.umount('/mnt/sysimage')
-                os.remove ('/tmp/' + dev)
 
 	raid.stopAllRaid(mdList)
 	
@@ -672,7 +671,6 @@ class ToDo:
             
             try:
                 table = _balkan.readTable ('/tmp/' + drive)
-		os.remove('/tmp/' + drive)
             except SystemError:
                 pass
             else:
@@ -685,52 +683,26 @@ class ToDo:
 			else:
                             dev = drive + str (i + 1)
                         try:
-                            isys.mount(dev, '/mnt/sysimage', readOnly = 1)
+                            isys.mount(dev, '/mnt/sysimage')
                         except SystemError, (errno, msg):
                             self.intf.messageWindow(_("Error"),
                                                     _("Error mounting ext2 filesystem on %s: %s") % (dev, msg))
                             continue
                         if os.access ('/mnt/sysimage/etc/fstab', os.R_OK):
-                            rootparts.append ((dev, "ext2"))
+                            rootparts.append (dev)
                         isys.umount('/mnt/sysimage')
-		    elif size and type == _balkan.DOS:
-			dev = drive + str (i + 1)
-                        try:
-                            isys.mount(dev, '/mnt/sysimage', fstype = "vfat",
-				       readOnly = 1)
-                        except SystemError, (errno, msg):
-			    log("failed to mount vfat filesystem on %s\n" 
-					% dev)
-                            continue
-
-			if os.access('/mnt/sysimage/redhat.img', os.R_OK):
-			    rootparts.append((dev, "vfat"))
-
-                        isys.umount('/mnt/sysimage')
-
+            os.remove ('/tmp/' + drive)
         win.pop ()
         return rootparts
 
-    def upgradeFindPackages (self, rootInfo):
-	(root, rootFs) = rootInfo
-	log("want to upgrade system on device %s, fs %s" % (root, rootFs))
+    def upgradeFindPackages (self, root):
         win = self.intf.waitWindow (_("Finding"),
                                     _("Finding packages to upgrade..."))
         if self.setupFilesystems:
 	    mdList = raid.startAllRaid(self.fstab.driveList())
-
-	    if rootFs == "vfat":
-		fstab.mountLoopbackRoot(root)
-	    else:
-		isys.mount(root, '/mnt/sysimage')
-
+            isys.mount(root, '/mnt/sysimage')
 	    fstab.readFstab('/mnt/sysimage/etc/fstab', self.fstab)
-
-	    if rootFs == "vfat":
-		fstab.unmountLoopbackRoot()
-	    else:
-		isys.umount('/mnt/sysimage')        
-
+            isys.umount('/mnt/sysimage')        
 	    raid.stopAllRaid(mdList)
 
 	    if self.fstab.hasDirtyFilesystems():
@@ -743,12 +715,7 @@ class ToDo:
 		sys.exit(0)
 
             self.fstab.mountFilesystems (self.instPath)
-
-	    if os.access("/mnt/loophost/rh-swap.img", os.R_OK):
-		self.fstab.setLoopbackSwapSize(-1)
-
 	    self.fstab.turnOnSwap(formatSwap = 0)
-
         self.getCompsList ()
 	self.getHeaderList ()
 
@@ -774,7 +741,7 @@ class ToDo:
                 hasgmc = 1
 
         self.dbpath = "/var/lib/anaconda-rebuilddb" + str(int(time.time()))
-        rpm.addMacro("_rebuilddbpath", self.dbpath);
+        rpm.addMacro("_dbpath_rebuild", self.dbpath);
 
         # now, set the system clock so the timestamps will be right:
         iutil.setClock (self.instPath)