reworked install flags

1 files changed, 23 insertions, 10 deletions

diff --git a/anaconda b/anaconda
index cdb3174f1..d659f95ea 100755
--- a/anaconda
+++ b/anaconda
@@ -2,14 +2,16 @@
 
 import sys, getopt, os
 
-(args, extra) = getopt.getopt(sys.argv[1:], 'p:gTtdr:', [ 'gui', 'text', 'test', 'force', 'debug', 'rootpath=', 'testpath=' ])
+(args, extra) = getopt.getopt(sys.argv[1:], 'p:gTtdr:f', 
+          [ 'gui', 'text', 'test', 'debug', 'rootpath=', 
+	    'testpath=', 'mountfs' ])
 
 mode = None
 test = 0
-force = 0
 debug = 0
 rootPath = '/mnt/sysimage'
-runLive = 0
+localInstall = 0
+forceMount = 0
 
 for n in args:
     (str, arg) = n
@@ -23,21 +25,21 @@ for n in args:
 	debug = 1
     elif (str == '-r' or str == '--rootpath'):
 	rootPath = arg
-	runLive = 1
+	localInstall = 1
     elif (str == '-p' or str == '--imagepath'):
 	imagepath = arg
-    elif (str == '--force'):
-	force = 1
+    elif (str == '--mountfs'):
+	forceMount = 1
 
 if (debug):
     import pdb
     pdb.set_trace()
 
-if (not test and os.getpid() > 10 and not force):
+if (not test and not localInstall and os.getpid() > 10):
     print "you're running me on a live system! that's incredibly stupid."
     sys.exit(1)
 
-if (test):
+if (os.path.exists('rpmmodule')):
     sys.path.append('balkan')
     sys.path.append('rpmmodule')
     sys.path.append('isys')
@@ -78,9 +80,20 @@ else:
 method = InstallMethod(imagepath)
 
 intf = InstallInterface()
-todo = ToDo(intf, method, rootPath, runLive)
+
+if localInstall:
+    installPackages = 1
+    setupFilesystems = 0
+if test:
+    installPackages = 0
+    setupFilesystems = 0
+if forceMount:
+    setupFilesystems = 1
+
+todo = ToDo(intf, method, rootPath, installSystem = installPackages,
+	    setupFilesystems = setupFilesystems)
 
 intf.run(todo)
-todo.installSystem()
+todo.doInstall()
 
 del intf