2005-03-02 Jeremy Katz <katzj@redhat.com>

	* kickstart.py (KickstartBase.doBootloader):  Don't install a
	bootloader if --location=none is provided in the kickstart config
	file (clumens, #146448).

2 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f796d29f1..deb7ac194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-02  Jeremy Katz  <katzj@redhat.com>
 
+	* kickstart.py (KickstartBase.doBootloader):  Don't install a
+	bootloader if --location=none is provided in the kickstart config
+	file (clumens, #146448).
+
 	* autopart.py (fitConstrained):  Allow logical partitions to go all
 	the way to the end of the extended partition.  (clumens, #101432)
 
diff --git a/kickstart.py b/kickstart.py
index b607b2e90..2833a5909 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)