todo.py:

1) verifyDeps -- specify how we're adding packages to the
   transaction set so that if new packages being installed obsolete
   something on the system, and something on the system has a
   dependency on that package being installed, that the dependency
   problem will appear. (#28069)
2) upgradeMountFilesystems -- read in the fstab so testing upgrades work

upgrade.py:

mountRootPartition -- use instPath - hardcoding /mnt/sysimage is bad bad.

2 files changed, 9 insertions, 2 deletions

diff --git a/todo.py b/todo.py
index cb4cccb81..647800029 100644
--- a/todo.py
+++ b/todo.py
@@ -1048,9 +1048,13 @@ class ToDo:
         else:
             ts = rpm.TransactionSet()
             
+        if self.upgrade:
+            how = 'u'
+        else:
+            how = 'i'
 	for p in self.hdList.packages.values ():
             if p.selected:
-                ts.add(p.h, (p.h, p.h[rpm.RPMTAG_NAME]))
+                ts.add(p.h, (p.h, p.h[rpm.RPMTAG_NAME]), how)
             else:
                 ts.add(p.h, (p.h, p.h[rpm.RPMTAG_NAME]), "a")
 
@@ -1172,6 +1176,9 @@ class ToDo:
 		    message = message + '\t' + n + '\n'
 		self.intf.messageWindow(("Absolute Symlinks"), message)
 		sys.exit(0)
+        else:
+            fstab.readFstab(self.instPath + '/etc/fstab', self.fstab)
+            
 
 	self.fstab.turnOnSwap(self.instPath, self.intf.progressWindow,
 			      formatSwap = 0)
diff --git a/upgrade.py b/upgrade.py
index de83f4efc..142ddf6c7 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -85,7 +85,7 @@ def mountRootPartition(intf, rootInfo, theFstab, instPath, allowDirty = 0,
     else:
 	isys.mount(root, '/mnt/sysimage')
 
-    fstab.readFstab('/mnt/sysimage/etc/fstab', theFstab)
+    fstab.readFstab(instPath + '/etc/fstab', theFstab)
 
     if rootFs == "vfat":
 	fstab.unmountLoopbackRoot()