It doesn't bring any good anymore and causes issues. Also remove the old comment that is no longer needed.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- pyanaconda/bootloader.py | 7 +------ pyanaconda/keyboard.py | 8 -------- pyanaconda/kickstart.py | 3 --- 3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 914d25d..f930752 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -2392,13 +2392,8 @@ def writeBootLoader(storage, payload, instClass, ksdata):
# set up dracut/fips boot args # XXX FIXME: do this from elsewhere? - #storage.bootloader.set_boot_args(keyboard=anaconda.keyboard, - # storage=anaconda.storage, - # language=anaconda.instLanguage, - # network=anaconda.network) storage.bootloader.set_boot_args(storage=storage, - payload=payload, - keyboard=ksdata.keyboard) + payload=payload)
try: storage.bootloader.write() diff --git a/pyanaconda/keyboard.py b/pyanaconda/keyboard.py index 9e322f2..4f8323e 100644 --- a/pyanaconda/keyboard.py +++ b/pyanaconda/keyboard.py @@ -253,14 +253,6 @@ def write_keyboard_config(keyboard, root, convert=True): if errors: raise KeyboardConfigError("\n".join(errors))
-def dracut_setup_args(): - """Function returning dracut setup args.""" - - args = set() - 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 53c6d6f..398cafa 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -1559,9 +1559,6 @@ class Keyboard(commands.keyboard.F18_Keyboard): def execute(self, *args): keyboard.write_keyboard_config(self, ROOT_PATH)
- def dracutSetupArgs(self, *args): - return keyboard.dracut_setup_args() - 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.