From dcc913781c1d7c921b0d06987bcbded4230c3e79 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Mon, 22 Apr 2002 16:27:13 +0000
Subject: merge bootloader changes from HEAD

---
 bootloader.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'bootloader.py')

diff --git a/bootloader.py b/bootloader.py
index 5bd484c4b..8cd6cba22 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -78,6 +78,21 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, comps):
     if bl.defaultDevice == -1:
         return
 
+    # now make the upgrade stuff work for kickstart too. ick.
+    if bl.kickstart == 1 and bl.doUpgradeOnly == 1:
+        import checkbootloader
+        (bootType, theDev) = checkbootloader.getBootloaderTypeAndBoot(instRoot)
+        
+        bl.doUpgradeonly = 1
+        if bootType == "GRUB":
+            bl.useGrubVal = 1
+            bl.setDevice(theDev)
+        elif bootType == "LILO":
+            bl.useGrubVal = 0
+            bl.setDevice(theDev)            
+        else:
+            bl.doUpgradeOnly = 0    
+
     w = intf.waitWindow(_("Bootloader"), _("Installing bootloader..."))
 
     kernelList = []
-- 
cgit