Change findExistingRoots to use the anaconda class, which required a

bunch of changes elsewhere in upgrade.py to also use anaconda.  This
required fixing up rescue mode (which was broken anyway) in the same way,
which then required the same sort of stuff done in anaconda.

Oh, and all that was so we could disable a meaningless error message on
searching for existing installations on hard drive installs/upgrades.

I forgot what I was really working on.

1 files changed, 7 insertions, 3 deletions

diff --git a/anaconda b/anaconda
index 30ded4793..6134efdac 100755
--- a/anaconda
+++ b/anaconda
@@ -547,6 +547,7 @@ class Anaconda:
         self.rootPath = None
         self.dispatch = None
         self.isKickstart = False
+        self.rescue_mount = True
 
     def setDispatch(self):
         self.dispatch = dispatch.Dispatcher(self)
@@ -647,6 +648,10 @@ if __name__ == "__main__":
 
     setupLoggingFromOpts(opts)
 
+    anaconda.rootPath = opts.rootPath
+    # Default is to prompt to mount the installed system.
+    anaconda.rescue_mount = not opts.rescue_nomount
+
     if opts.method and opts.method[0] == '@':
         expandFTPMethod(opts)
 
@@ -692,8 +697,8 @@ if __name__ == "__main__":
 
         import rescue, instdata
 
-        rescueid = instdata.InstallData([], "fd0", opts.method, opts.display_mode)
-        rescue.runRescue(opts.rootPath, not opts.rescue_nomount, rescueid)
+        anaconda.id = instdata.InstallData([], "fd0", opts.method, opts.display_mode)
+        rescue.runRescue(anaconda)
 
         # shouldn't get back here
         sys.exit(1)
@@ -835,7 +840,6 @@ if __name__ == "__main__":
     if opts.display_mode == 'g' and flags.usevnc:
         runVNC(vncpassword, vncconnecthost, vncconnectport, doStartupX11Actions)
 
-    anaconda.rootPath = opts.rootPath
     anaconda.intf = getInstallInterface(opts)
 
     # imports after setting up the path