|
 |
fbcaed |
From 918a9b0743f63c630144463df1d8daf7538aa27c Mon Sep 17 00:00:00 2001
|
|
|
fbcaed |
From: Colin Walters <walters@verbum.org>
|
|
|
fbcaed |
Date: Mon, 5 May 2014 12:42:19 -0400
|
|
|
fbcaed |
Subject: [PATCH 09/20] bootloader: Allow extlinux loader configuration to
|
|
|
fbcaed |
handle RPMOSTreePayload case
|
|
|
fbcaed |
|
|
|
fbcaed |
For RPMOSTreePayload, we are just laying down the bootloader
|
|
|
fbcaed |
configuration with no kernel - OSTree then updates that configuration.
|
|
|
fbcaed |
|
|
|
fbcaed |
Resolves: rhbz#1113535
|
|
|
fbcaed |
Port of rpmostreepayload patches from master
|
|
|
fbcaed |
commit 627486c22cdaf6c07009026791f5bd6fc1aaadaa
|
|
|
fbcaed |
---
|
|
|
fbcaed |
pyanaconda/bootloader.py | 6 +++---
|
|
|
fbcaed |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
fbcaed |
|
|
|
fbcaed |
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
|
|
|
fbcaed |
index 90aec61..860bde3 100644
|
|
|
fbcaed |
--- a/pyanaconda/bootloader.py
|
|
|
fbcaed |
+++ b/pyanaconda/bootloader.py
|
|
|
fbcaed |
@@ -2253,10 +2253,10 @@ class EXTLINUX(BootLoader):
|
|
|
fbcaed |
"menu hidden\n\n"
|
|
|
fbcaed |
"timeout %(timeout)d\n"
|
|
|
fbcaed |
"#totaltimeout 9000\n\n"
|
|
|
fbcaed |
- "default %(default)s\n\n"
|
|
|
fbcaed |
- % { "productName": productName, "timeout": self.timeout *10,
|
|
|
fbcaed |
- "default": self.image_label(self.default)})
|
|
|
fbcaed |
+ % { "productName": productName, "timeout": self.timeout *10 })
|
|
|
fbcaed |
config.write(header)
|
|
|
fbcaed |
+ if self.default is not None:
|
|
|
fbcaed |
+ config.write("default %(default)s\n\n" % { "default" : self.image_label(self.default) })
|
|
|
fbcaed |
self.write_config_password(config)
|
|
|
fbcaed |
|
|
|
fbcaed |
def write_config_password(self, config):
|
|
|
fbcaed |
--
|
|
|
fbcaed |
1.9.3
|
|
|
fbcaed |
|