imgcreate/kickstart.py | 7 +++++++ imgcreate/live.py | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit 856a05d2d69dde3df25849970fa0d6c200f03b5c Author: Jeremy Katz katzj@redhat.com Date: Mon Jul 7 17:36:46 2008 -0400
plymouth should imply rhgb now as well
diff --git a/imgcreate/live.py b/imgcreate/live.py index bd7f3e4..0bf50f2 100644 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -97,6 +97,8 @@ class LiveImageCreatorBase(LoopImageCreator): r = kickstart.get_kernel_args(self.ks) if os.path.exists(self._instroot + "/usr/bin/rhgb"): r += " rhgb" + if os.path.exists(self._instroot + "/usr/bin/plymouth"): + r += " rhgb" return r
def _get_mkisofs_options(self, isodir):
commit 32575fd38289cb6777c2e2f9fd9ccc53b0bc8d55 Author: Jeremy Katz katzj@redhat.com Date: Mon Jul 7 17:30:27 2008 -0400
Listen to bootloader --append
We lost support for using 'bootloader --append=foo' to add arguments to the kernel command-line at some point. Add back support for this
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 39756b2..0f797b8 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -444,6 +444,13 @@ def get_timeout(ks, default = None): return default return int(ks.handler.bootloader.timeout)
+def get_kernel_args(ks, default = "ro liveimg quiet"): + if not hasattr(ks.handler.bootloader, "appendLine"): + return default + if ks.handler.bootloader.appendLine is None: + return default + return "%s %s" %(default, ks.handler.bootloader.appendLine) + def get_default_kernel(ks, default = None): if not hasattr(ks.handler.bootloader, "default"): return default diff --git a/imgcreate/live.py b/imgcreate/live.py index 1c54cf6..bd7f3e4 100644 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -94,7 +94,7 @@ class LiveImageCreatorBase(LoopImageCreator): A sensible default implementation is provided.
""" - r = "ro quiet liveimg" + r = kickstart.get_kernel_args(self.ks) if os.path.exists(self._instroot + "/usr/bin/rhgb"): r += " rhgb" return r
livecd@lists.fedoraproject.org