Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2023-07-30 22:08:51 +0200
committerGitHub <noreply@github.com>2023-07-30 22:08:51 +0200
commita1ad25ff4575d874b5634cee57a927a041283886 (patch)
tree632f33e69fc10bd3590536c794434873b524e501 /archinstall
parent355a0dbe06ace619387b26883a8619954aa7475d (diff)
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
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py9
1 files changed, 6 insertions, 3 deletions
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