From dce9ad294149617f8dabd126c4a36e6015ca809e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Wed, 25 Apr 2018 08:41:22 +0200 Subject: [PATCH] bootloader: Check if grub2_cfg_file_name is None in _remove_grub2_tuning() Resolves: rhbz#1571403 Fixes #82 --- tuned/plugins/plugin_bootloader.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tuned/plugins/plugin_bootloader.py b/tuned/plugins/plugin_bootloader.py index a0dca11..dd514cf 100644 --- a/tuned/plugins/plugin_bootloader.py +++ b/tuned/plugins/plugin_bootloader.py @@ -92,6 +92,9 @@ class BootloaderPlugin(base.Plugin): return self._cmd.add_modify_option_in_file(consts.BOOT_CMDLINE_FILE, d) def _remove_grub2_tuning(self): + if self._grub2_cfg_file_name is None: + log.error("cannot find grub.cfg to patch, you need to regenerate it by hand using grub2-mkconfig") + return self._patch_bootcmdline({consts.BOOT_CMDLINE_TUNED_VAR : "", consts.BOOT_CMDLINE_INITRD_ADD_VAR : ""}) self._cmd.add_modify_option_in_file(self._grub2_cfg_file_name, {"set\s+" + consts.GRUB2_TUNED_VAR : "", "set\s+" + consts.GRUB2_TUNED_INITRD_VAR : ""}, add = False) if self._initrd_dst_img_val is not None: