[rhel7-branch] Do not write out the vconsole.* boot options (#1111405)

Vratislav Podzimek vpodzime at redhat.com
Mon Aug 4 14:43:42 UTC 2014


It no longer does any good and just causes potential problems with changing
VConsole keymap and font in the configuration file and regenerating initrd.img
with dracut.

(merged patches a7ad0d80c2827c2e9f3a0151a570b1e96f7adeb4 and
8c68f41c596c55e50141abb6bed2f52e27db51bf from master)

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/bootloader.py |  3 +--
 pyanaconda/keyboard.py   | 17 -----------------
 pyanaconda/kickstart.py  |  3 ---
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 421cdb0..63f141c 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2384,8 +2384,7 @@ def writeBootLoaderFinal(storage, payload, instClass, ksdata):
     # set up dracut/fips boot args
     # XXX FIXME: do this from elsewhere?
     storage.bootloader.set_boot_args(storage=storage,
-                                     payload=payload,
-                                     keyboard=ksdata.keyboard)
+                                     payload=payload)
     try:
         storage.bootloader.write()
     except BootLoaderError as e:
diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py
index 55a2773..f3f227b 100755
--- a/pyanaconda/keyboard.py
+++ b/pyanaconda/keyboard.py
@@ -254,23 +254,6 @@ def write_keyboard_config(keyboard, root, convert=True):
     if errors:
         raise KeyboardConfigError("\n".join(errors))
 
-def dracut_setup_args(keyboard):
-    """
-    Function returning dracut setup args for the given keyboard configuration.
-
-    :type keyboard: ksdata.keyboard object
-
-    """
-
-    if not keyboard.vc_keymap:
-        populate_missing_items(keyboard)
-
-    args = set()
-    args.add("vconsole.keymap=%s" % keyboard.vc_keymap)
-    args.add("vconsole.font=%s" % DEFAULT_VC_FONT)
-
-    return args
-
 def _try_to_load_keymap(keymap):
     """
     Method that tries to load keymap and returns boolean indicating if it was
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 0c7e970..c3afbc0 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1533,9 +1533,6 @@ class Keyboard(commands.keyboard.F18_Keyboard):
     def execute(self, *args):
         keyboard.write_keyboard_config(self, iutil.getSysroot())
 
-    def dracutSetupArgs(self, *args):
-        return keyboard.dracut_setup_args(self)
-
 class Upgrade(commands.upgrade.F20_Upgrade):
     # Upgrade is no longer supported. If an upgrade command was included in
     # a kickstart, warn the user and exit.
-- 
1.9.3



More information about the anaconda-patches mailing list