nikon/tuned
1
0
Fork 0
Code Activity Actions

Merge pull request #248 from jmencak/bootcmdline-unapply

Browse source 
Unapply bootcmdline settings even when grub.cfg does not exits.
This commit is contained in:
Jaroslav Škarvada 2020-04-16 15:03:48 +02:00 committed by GitHub
commit 3e2b7069fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tuned/plugins/plugin_bootloader.py
View file

@ -93,10 +93,10 @@ class BootloaderPlugin(base.Plugin):
return self._cmd.add_modify_option_in_file(consts.BOOT_CMDLINE_FILE, d)
def _remove_grub2_tuning(self):
self._patch_bootcmdline({consts.BOOT_CMDLINE_TUNED_VAR : "", consts.BOOT_CMDLINE_INITRD_ADD_VAR : ""})
if not self._grub2_cfg_file_names:
log.info("cannot find grub.cfg to patch")
return
self._patch_bootcmdline({consts.BOOT_CMDLINE_TUNED_VAR : "", consts.BOOT_CMDLINE_INITRD_ADD_VAR : ""})
for f in self._grub2_cfg_file_names:
self._cmd.add_modify_option_in_file(f, {"set\s+" + consts.GRUB2_TUNED_VAR : "", "set\s+" + consts.GRUB2_TUNED_INITRD_VAR : ""}, add = False)
if self._initrd_dst_img_val is not None: