Don't install a bootloader if --location=none is provided in the kickstart

config file (#146448).

2 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index cc639c0dc..a803ea2aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2005-01-31  Chris Lumens  <clumens@redhat.com>
+
+	* kickstart.py (KickstartBase.doBootloader):  Don't install a
+	bootloader if --location=none is provided in the kickstart config
+	file (#146448).
+
 2005-01-26  Chris Lumens  <clumens@redhat.com>
 
-	* gui.py:   Fixed deprecation warnings for gtk.idle_add,
+	* gui.py:  Fixed deprecation warnings for gtk.idle_add,
 	gtk.idle_remove, gtk.timeout_add, gtk.timeout_remove.
 	* iw/installpath_gui.py:  Fixed deprecation warning for
 	ics.readPixmap.
diff --git a/kickstart.py b/kickstart.py
index bca47b6e7..578cc8d17 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -375,18 +375,18 @@ class KickstartBase(BaseInstallClass):
             id.bootloader.kickstart = 1
             id.bootloader.doUpgradeOnly = 1
 
-        
-        self.showSteps.append("bootloadersetup")
-                
-        self.setBootloader(id, useLilo, location, linear, forceLBA,
+        if location is None:
+            self.skipSteps.append("bootloadersetup")
+            self.skipSteps.append("instbootloader")
+        else:
+            self.showSteps.append("bootloadersetup")
+            self.setBootloader(id, useLilo, location, linear, forceLBA,
                            password, md5pass, appendLine, driveorder)
+
         self.skipSteps.append("upgbootloader")
         self.skipSteps.append("bootloader")
         self.skipSteps.append("bootloaderadvanced")
 
-        if location is None:
-            self.skipSteps.append("instbootloader")
-
     def doLilo	(self, id, args):
         self.doBootloader(id, args, useLilo = 1)