From d89ab6731b41c9beac2f11e9588916f2d0397e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 3 Mar 2017 14:58:24 +0100 Subject: [PATCH] bootloader: remove initrd image during cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related: rhbz#1414098 Signed-off-by: Jaroslav Škarvada --- tuned/plugins/plugin_bootloader.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tuned/plugins/plugin_bootloader.py b/tuned/plugins/plugin_bootloader.py index 3ed5a27..2062aec 100644 --- a/tuned/plugins/plugin_bootloader.py +++ b/tuned/plugins/plugin_bootloader.py @@ -92,10 +92,12 @@ class BootloaderPlugin(base.Plugin): def _remove_grub2_tuning(self): 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) + log.info("removing initrd image '%s'" % self._initrd_dst_img_val) + self._cmd.unlink(self._initrd_dst_img_val) def _instance_unapply_static(self, instance, profile_switch = False): if profile_switch: - log.info("removing grub2 command line previously added by tuned") + log.info("removing grub2 tuning previously added by Tuned") self._remove_grub2_tuning() def _grub2_cfg_unpatch(self, grub2_cfg):