more merging fun from the hampton branch. I'm pretty sure this doesn't

work now, at least in gui.  text mode might, though

1 files changed, 17 insertions, 2 deletions

diff --git a/kickstart.py b/kickstart.py
index 6d7abd7ff..012bf90b9 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -109,7 +109,7 @@ class KickstartBase(BaseInstallClass):
 		trusts.append(arg)
 	    elif str == '--port':
 		if ports:
-		    ports = '%s %s' % (ports, arg)
+		    ports = '%s,%s' % (ports, arg)
 		else:
 		    ports = arg
 	    
@@ -220,7 +220,8 @@ class KickstartBase(BaseInstallClass):
     def doBootloader (self, id, args, useLilo = 0):
         (args, extra) = isys.getopt(args, '',
                 [ 'append=', 'location=', 'useLilo', 'lba32',
-                  'password=', 'md5pass=', 'linear', 'nolinear'])
+                  'password=', 'md5pass=', 'linear', 'nolinear',
+                  'upgrade'])
 
         validLocations = [ "mbr", "partition", "none" ]
         appendLine = ""
@@ -229,6 +230,7 @@ class KickstartBase(BaseInstallClass):
         md5pass = None
         forceLBA = 0
         linear = 1
+        upgrade = 0
 
         for n in args:
             (str, arg) = n
@@ -248,6 +250,8 @@ class KickstartBase(BaseInstallClass):
                 password = arg
             elif str == '--md5pass':
                 md5pass = arg
+            elif str == '--upgrade':
+                upgrade = 1
 
         if location not in validLocations:
             raise ValueError, "mbr, partition, or none expected for bootloader command"
@@ -255,9 +259,19 @@ class KickstartBase(BaseInstallClass):
             location = None
         else:
             location = validLocations.index(location)
+
+        # FIXME: upgrade mode not implemented yet on HEAD
+        if upgrade and not id.upgrade.get():
+            raise RuntimeError, "Selected upgrade mode for bootloader but not doing an upgrade"
+
+        if upgrade:
+            id.bootloader.kickstart = 1
+            id.bootloader.doUpgradeOnly = 1
                 
         self.setBootloader(id, useLilo, location, linear, forceLBA,
                            password, md5pass, appendLine)
+        # FIXME: uncomment when upgrade boot loader stuff is merged
+#        self.skipSteps.append("upgbootloader")
         self.skipSteps.append("bootloader")
         self.skipSteps.append("bootloaderadvanced")
 
@@ -652,6 +666,7 @@ class KickstartBase(BaseInstallClass):
 		raidDev = arg
                 if raidDev[0:2] == "md":
                     raidDev = raidDev[2:]
+                raidDev = int(raidDev)
             elif str == "--spares":
                 spares = int(arg)
             elif str == "--noformat":