Bug 1556990

Description of problem:When configuring a tuned profile to set cmdline parameters via the bootloader plugin on a uefi install. If for some reason the /boot/grub2/grub.cfg file exist, then the /boot/efi/EFI/redhat/grub.cfg does not get updated on a profile change, only the /boot/grub2/grub.cfg file gets updated. This is due to fact that the _get_grub2_cfg_file function loops through the GRUB2_CFG_FILES array and checks if one of the files exist, if it does it returns and doesn't continue. Since the /boot/grub2/grub.cfg file exist it doesn't continue on to check if both exist. It's very easy for someone to not recognize that the server is uefi, and accidentally run a grub2-mkconfig -o on the /etc/grub2.cfg symlink, which would cause this issue to happen.


Version-Release number of selected component (if applicable): tuned-2.8.0-5.el7_4.2


Steps to Reproduce:
1. On a uefi install setup a profile to set a cmdline parameter.
2. Touch /boot/grub2/grub.cfg
3. run # tuned-adm profile test-profile 


Actual results:
After running the above, you will see the /boot/efi/EFI/redhat/grub.cfg does not get updated. If a grub2-mkconfig -o /boot/grub2/grub.cfg is ran instead of the touch command above. Then you will see that on applying the profile it will update the /boot/grub2/grub.cfg file correctly.


Expected results:
Update only the /boot/efi/EFI/redhat/grub.cfg or update any of the files in the array if they exist just in case.


Additional info:
** I feel that an quick and easy fix would be to reorder the array entries, and place the efi path before the non efi path. 

** But I also threw together the below patch that changes the plugin to update all of the files in the GRUB2_CFG_FILES array if they exist. 

diff -up /usr/lib/python2.7/site-packages/tuned/plugins/plugin_bootloader.py.old /usr/lib/python2.7/site-packages/tuned/plugins/plugin_bootloader.py
--- /usr/lib/python2.7/site-packages/tuned/plugins/plugin_bootloader.py.old	2018-03-15 12:46:07.726685744 -0400
+++ /usr/lib/python2.7/site-packages/tuned/plugins/plugin_bootloader.py	2018-03-15 12:45:50.794161184 -0400
@@ -82,17 +82,22 @@ class BootloaderPlugin(base.Plugin):
 		return effective
 
 	def _get_grub2_cfg_file(self):
+		cfg_files = []
 		for f in consts.GRUB2_CFG_FILES:
 			if os.path.exists(f):
-				return f
-		return None
+				cfg_files.append(f)
+		if not cfg_files:
+			return None
+		else:
+			return cfg_files
 
 	def _patch_bootcmdline(self, d):
 		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 : ""})
-		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)
+		for f in self._grub2_cfg_file_name:
+			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:
 			log.info("removing initrd image '%s'" % self._initrd_dst_img_val)
 			self._cmd.unlink(self._initrd_dst_img_val)
@@ -153,27 +158,28 @@ class BootloaderPlugin(base.Plugin):
 		if self._grub2_cfg_file_name is None:
 			log.error("cannot find grub.cfg to patch, you need to regenerate it by hand by grub2-mkconfig")
 			return False
-		grub2_cfg = self._cmd.read_file(self._grub2_cfg_file_name)
-		if len(grub2_cfg) <= 0:
-			log.error("error patching %s, you need to regenerate it by hand by grub2-mkconfig" % self._grub2_cfg_file_name)
-			return False
-		log.debug("adding boot command line parameters to '%s'" % self._grub2_cfg_file_name)
-		grub2_cfg_new = grub2_cfg
-		patch_initial = False
-		for opt in d:
-			(grub2_cfg_new, nsubs) = re.subn(r"\b(set\s+" + opt + "\s*=).*$", r"\1" + "\"" + d[opt] + "\"", grub2_cfg_new, flags = re.MULTILINE)
-			if nsubs < 1 or re.search(r"\$" + opt, grub2_cfg, flags = re.MULTILINE) is None:
-				patch_initial = True
-
-		# workaround for rhbz#1442117
-		if len(re.findall(r"\$" + consts.GRUB2_TUNED_VAR, grub2_cfg, flags = re.MULTILINE)) != \
-			len(re.findall(r"\$" + consts.GRUB2_TUNED_INITRD_VAR, grub2_cfg, flags = re.MULTILINE)):
-				patch_initial = True
-
-		if patch_initial:
-			grub2_cfg_new = self._grub2_cfg_patch_initial(self._grub2_cfg_unpatch(grub2_cfg), d)
-		self._cmd.write_to_file(self._grub2_cfg_file_name, grub2_cfg_new)
-		self._grub2_default_env_patch()
+		for f in self._grub2_cfg_file_name:
+			grub2_cfg = self._cmd.read_file(f)
+			if len(grub2_cfg) <= 0:
+				log.error("error patching %s, you need to regenerate it by hand by grub2-mkconfig" % f)
+				return False
+			log.debug("adding boot command line parameters to '%s'" % f)
+			grub2_cfg_new = grub2_cfg
+			patch_initial = False
+			for opt in d:
+				(grub2_cfg_new, nsubs) = re.subn(r"\b(set\s+" + opt + "\s*=).*$", r"\1" + "\"" + d[opt] + "\"", grub2_cfg_new, flags = re.MULTILINE)
+				if nsubs < 1 or re.search(r"\$" + opt, grub2_cfg, flags = re.MULTILINE) is None:
+					patch_initial = True
+
+			# workaround for rhbz#1442117
+			if len(re.findall(r"\$" + consts.GRUB2_TUNED_VAR, grub2_cfg, flags = re.MULTILINE)) != \
+				len(re.findall(r"\$" + consts.GRUB2_TUNED_INITRD_VAR, grub2_cfg, flags = re.MULTILINE)):
+					patch_initial = True
+
+			if patch_initial:
+				grub2_cfg_new = self._grub2_cfg_patch_initial(self._grub2_cfg_unpatch(grub2_cfg), d)
+			self._cmd.write_to_file(f, grub2_cfg_new)
+			self._grub2_default_env_patch()
 		return True
 
 	def _grub2_update(self):