RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Anton Hvornum 2023-07-30 22:08:51 +02:00 committed by GitHub
parent 355a0dbe06
commit a1ad25ff45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archinstall/lib/installer.py
View File

@ -569,9 +569,11 @@ class Installer:
mkinit.write(f"HOOKS=({' '.join(self._hooks)})\n") mkinit.write(f"HOOKS=({' '.join(self._hooks)})\n")
try: 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 return True
except SysCallError: except SysCallError as error:
if error.worker:
log(error.worker._trace_log.decode())
return False return False
def minimal_installation( def minimal_installation(
@ -664,7 +666,8 @@ class Installer:
# TODO: Use python functions for this # TODO: Use python functions for this
SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root') 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 self.helper_flags['base'] = True