[Fedora-livecd-list] imgcreate/kickstart.py imgcreate/live.py

Jeremy Katz katzj at fedoraproject.org
Wed Aug 13 17:13:58 UTC 2008


 imgcreate/kickstart.py |    7 -------
 imgcreate/live.py      |    4 ----
 2 files changed, 11 deletions(-)

New commits:
commit 29212b58963fbb366f5451f817c2caad4458a2cf
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Aug 13 13:10:10 2008 -0400

    Some parts of the kernel append line were already handled; revert
    
    This reverts commit 7ffdfbc3ca2523f44e0c30a8a9938635d6ba0281.

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 6ff5a73..e352e98 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -461,13 +461,6 @@ def get_default_kernel(ks, default = None):
         return default
     return ks.handler.bootloader.default
 
-def get_kernel_append_line(ks, default = None):
-    if not hasattr(ks.handler.bootloader, "appendLine"):
-        return default
-    if not ks.handler.bootloader.appendLine:
-        return default
-    return ks.handler.bootloader.appendLine
-
 def get_repos(ks, repo_urls = {}):
     repos = []
     for repo in ks.handler.repo.repoList:
diff --git a/imgcreate/live.py b/imgcreate/live.py
index c4e4d3e..f98f76c 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -99,10 +99,6 @@ class LiveImageCreatorBase(LoopImageCreator):
             r += " rhgb"
         if os.path.exists(self._instroot + "/usr/bin/plymouth"):
             r += " rhgb"
-        # Get --append line from kickstart bootloader option.
-        append_line = kickstart.get_kernel_append_line(self.ks)
-        if append_line:
-            r += " " + append_line
         return r
         
     def _get_mkisofs_options(self, isodir):





More information about the livecd mailing list