Refactor `_add_efistub_bootloader()` cmdline (#2059)

archinstall/lib/installer.py

@@ -1047,27 +1047,22 @@ TIMEOUT=5
 		# points towards the same disk and/or partition.
 		# And in which case we should do some clean up.
 
-		for kernel in self.kernels:
+		microcode = []
-			# Setup the firmware entry
-			label = f'Arch Linux ({kernel})'
-			loader = f"/vmlinuz-{kernel}"
-
-			kernel_parameters = []
 
 		if not SysInfo.is_vm():
 			vendor = SysInfo.cpu_vendor()
 			if vendor == "AuthenticAMD":
-					kernel_parameters.append("initrd=\\amd-ucode.img")
+				microcode.append("initrd=\\amd-ucode.img")
 			elif vendor == "GenuineIntel":
-					kernel_parameters.append("initrd=\\intel-ucode.img")
+				microcode.append("initrd=\\intel-ucode.img")
 			else:
 				debug(f"Unknown CPU vendor '{vendor}' detected. Archinstall won't add any ucode to firmware boot entry.")
 
-			kernel_parameters.append(f"initrd=\\initramfs-{kernel}.img")
-
 		# blkid doesn't trigger on loopback devices really well,
 		# so we'll use the old manual method until we get that sorted out.
 
+		kernel_parameters = []
+
 		if root_partition in self._disk_encryption.partitions:
 			# TODO: We need to detect if the encrypted device is a whole disk encryption,
 			#       or simply a partition encryption. Right now we assume it's a partition (and we always have)
@@ -1079,13 +1074,24 @@ TIMEOUT=5
 
 		parent_dev_path = disk.device_handler.get_parent_device_path(boot_partition.safe_dev_path)
 
+		for kernel in self.kernels:
+			# Setup the firmware entry
+			label = f'Arch Linux ({kernel})'
+			loader = f"/vmlinuz-{kernel}"
+
+			cmdline = []
+
+			cmdline.extend(microcode)
+			cmdline.append(f"initrd=\\initramfs-{kernel}.img")
+			cmdline.extend(kernel_parameters)
+
 			cmd = f'efibootmgr ' \
 				f'--disk {parent_dev_path} ' \
 				f'--part {boot_partition.safe_dev_path} ' \
 				f'--create ' \
 				f'--label "{label}" ' \
 				f'--loader {loader} ' \
-				f'--unicode \'{" ".join(kernel_parameters)}\' ' \
+				f'--unicode \'{" ".join(cmdline)}\' ' \
 				f'--verbose'
 
 			SysCommand(cmd)