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