Merge branch 'archlinux:master' into master

2 files changed, 6 insertions, 1 deletions

diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index 249c7890..3b62c891 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -333,6 +333,10 @@ class SysCommand:
 			while self.session.ended is None:
 				self.session.poll()
 
+			if self.peak_output:
+				sys.stdout.write('\n')
+				sys.stdout.flush()
+
 		except SysCallError:
 			return False
 
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 29b3bc1a..1be398e9 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -453,6 +453,7 @@ class Installer:
 				self.pacstrap('efibootmgr')
 				o = b''.join(SysCommand(f'/usr/bin/arch-chroot {self.target} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB'))
 				SysCommand('/usr/bin/arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg')
+				self.helper_flags['bootloder'] = True
 				return True
 			else:
 				root_device = subprocess.check_output(f'basename "$(readlink -f /sys/class/block/{root_partition.path.replace("/dev/", "")}/..)"', shell=True).decode().strip()
@@ -460,7 +461,7 @@ class Installer:
 					root_device = f"{root_partition.path}"
 				o = b''.join(SysCommand(f'/usr/bin/arch-chroot {self.target} grub-install --target=i386-pc /dev/{root_device}'))
 				SysCommand('/usr/bin/arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg')
-				self.helper_flags['bootloader'] = bootloader
+				self.helper_flags['bootloader'] = True
 				return True
 		else:
 			raise RequirementError(f"Unknown (or not yet implemented) bootloader requested: {bootloader}")