summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bootloader.py5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ae06353e..de5ebe5c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-10 Chris Lumens <clumens@redhat.com>
+
+ * bootloader.py (bootloaderSetupChoices): If the kickstart file
+ specified a drive order, pass that to booty (#214881).
+
2006-11-08 Peter Jones <pjones@redhat.com>
* isys/isys.c (doGetBiosDisk): Check return value of getBiosDisk and
diff --git a/bootloader.py b/bootloader.py
index ba25dcf9c..8bb6c1d06 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -40,7 +40,10 @@ def bootloaderSetupChoices(anaconda):
if flags.livecd:
return
- anaconda.id.bootloader.updateDriveList()
+ if anaconda.id.ksdata:
+ anaconda.id.bootloader.updateDriveList(anaconda.id.ksdata.bootloader["driveorder"])
+ else:
+ anaconda.id.bootloader.updateDriveList()
# iSeries bootloader on upgrades
if iutil.getPPCMachine() == "iSeries" and not anaconda.id.bootloader.device: