From 7d90283d3d8749c0107e86bbd494187c9936d41b Mon Sep 17 00:00:00 2001 From: JF Ding Date: Fri, 3 Feb 2012 19:27:16 +0800 Subject: [PATCH] remove the hardcoded default args for bootloader removed the following settings: default "liveinst":"Installation Only" bootmenu item default "quiet" kernel args if not specified in ks --- mic/imager/livecd.py | 18 +++++++++--------- mic/kickstart/__init__.py | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mic/imager/livecd.py b/mic/imager/livecd.py index 9dc33cf..92d7e99 100644 --- a/mic/imager/livecd.py +++ b/mic/imager/livecd.py @@ -118,17 +118,17 @@ class LiveImageCreatorBase(LoopImageCreator): A sensible default implementation is provided. """ + if self.ks is None: - r = "ro liveimg quiet" - if os.path.exists(self._instroot + "/usr/bin/rhgb"): - r += " rhgb" - if os.path.exists(self._instroot + "/usr/bin/plymouth"): - r += " rhgb" - return r - r = kickstart.get_kernel_args(self.ks) + r = "ro liveimg" + else: + r = kickstart.get_kernel_args(self.ks) + if os.path.exists(self._instroot + "/usr/bin/rhgb") or \ - os.path.exists(self._instroot + "/usr/bin/plymouth"): - r += " rhgb" + os.path.exists(self._instroot + "/usr/bin/plymouth") and \ + ' rhgb' not in r: + r += ' rhgb' + return r def _get_mkisofs_options(self, isodir): diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py index d8c264e..d08121d 100644 --- a/mic/kickstart/__init__.py +++ b/mic/kickstart/__init__.py @@ -45,8 +45,8 @@ def read_kickstart(path): be then passed to an ImageCreator constructor. If an error occurs, a CreatorError exception is thrown. - """ + #version = ksversion.makeVersion() #ks = ksparser.KickstartParser(version) @@ -649,7 +649,7 @@ def get_kernel_args(ks, default = "ro liveimg"): return default return "%s %s" %(default, ks.handler.bootloader.appendLine) -def get_menu_args(ks, default = "liveinst"): +def get_menu_args(ks, default = ""): if not hasattr(ks.handler.bootloader, "menus"): return default if ks.handler.bootloader.menus in (None, ""): -- 2.7.4