From a1ad25ff4575d874b5634cee57a927a041283886 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 30 Jul 2023 22:08:51 +0200 Subject: Mkinitcpio turn on output (#1963) * Turning on output for mkinitcpio, otherwise the prompt stand still for a while after enabling fstrim. * Added error message for when mkinitcpio errors out (but also say we're continuing) * Pleasing mypy --- archinstall/lib/installer.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 48177013..94bdff7d 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -569,9 +569,11 @@ class Installer: mkinit.write(f"HOOKS=({' '.join(self._hooks)})\n") try: - SysCommand(f'/usr/bin/arch-chroot {self.target} mkinitcpio {" ".join(flags)}') + SysCommand(f'/usr/bin/arch-chroot {self.target} mkinitcpio {" ".join(flags)}', peek_output=True) return True - except SysCallError: + except SysCallError as error: + if error.worker: + log(error.worker._trace_log.decode()) return False def minimal_installation( @@ -664,7 +666,8 @@ class Installer: # TODO: Use python functions for this SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root') - self.mkinitcpio(['-P'], locale_config) + if not self.mkinitcpio(['-P'], locale_config): + error(f"Error generating initramfs (continuing anyway)") self.helper_flags['base'] = True -- cgit v1.2.3-54-g00ecf