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

Preparing log-data and debug output.

This commit is contained in:
Anton Hvornum 2020-10-20 21:40:17 +00:00
parent 66e495e994
commit e06ca749a4
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
archinstall/lib/installer.py
View File

@ -66,6 +66,8 @@ class Installer():
log('Some required steps were not successfully installed/configured before leaving the installer:', bg='black', fg='red') log('Some required steps were not successfully installed/configured before leaving the installer:', bg='black', fg='red')
for step in missing_steps: for step in missing_steps:
log(f' - {step}', bg='black', fg='red') log(f' - {step}', bg='black', fg='red')
log(f"Detailed error logs can be found at: {log_path}")
log(f"Submit this zip file as an issue to https://github.com/Torxed/archinstall/issues")
return False return False
def post_install_check(self, *args, **kwargs): def post_install_check(self, *args, **kwargs):
@ -168,47 +170,51 @@ class Installer():
self.helper_flags['base'] = True self.helper_flags['base'] = True
return True return True
def add_bootloader(self): def add_bootloader(self, bootloader='systemd-bootctl'):
log(f'Adding bootloader to {self.boot_partition}') log(f'Adding bootloader {bootloader} to {self.boot_partition}')
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} bootctl --no-variables --path=/boot install'))
with open(f'{self.mountpoint}/boot/loader/loader.conf', 'w') as loader:
loader.write('default arch\n')
loader.write('timeout 5\n')
## For some reason, blkid and /dev/disk/by-uuid are not getting along well. if bootloader == 'systemd-bootctle':
## And blkid is wrong in terms of LUKS. o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} bootctl --no-variables --path=/boot install'))
#UUID = sys_command('blkid -s PARTUUID -o value {drive}{partition_2}'.format(**args)).decode('UTF-8').strip() with open(f'{self.mountpoint}/boot/loader/loader.conf', 'w') as loader:
with open(f'{self.mountpoint}/boot/loader/entries/arch.conf', 'w') as entry: loader.write('default arch\n')
entry.write('title Arch Linux\n') loader.write('timeout 5\n')
entry.write('linux /vmlinuz-linux\n')
entry.write('initrd /initramfs-linux.img\n') ## For some reason, blkid and /dev/disk/by-uuid are not getting along well.
## blkid doesn't trigger on loopback devices really well, ## And blkid is wrong in terms of LUKS.
## so we'll use the old manual method until we get that sorted out. #UUID = sys_command('blkid -s PARTUUID -o value {drive}{partition_2}'.format(**args)).decode('UTF-8').strip()
with open(f'{self.mountpoint}/boot/loader/entries/arch.conf', 'w') as entry:
entry.write('title Arch Linux\n')
entry.write('linux /vmlinuz-linux\n')
entry.write('initrd /initramfs-linux.img\n')
## blkid doesn't trigger on loopback devices really well,
## so we'll use the old manual method until we get that sorted out.
if self.partition.encrypted: if self.partition.encrypted:
for root, folders, uids in os.walk('/dev/disk/by-uuid'): for root, folders, uids in os.walk('/dev/disk/by-uuid'):
for uid in uids: for uid in uids:
real_path = os.path.realpath(os.path.join(root, uid)) real_path = os.path.realpath(os.path.join(root, uid))
if not os.path.basename(real_path) == os.path.basename(self.partition.real_device): continue if not os.path.basename(real_path) == os.path.basename(self.partition.real_device): continue
entry.write(f'options cryptdevice=UUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n') entry.write(f'options cryptdevice=UUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n')
self.helper_flags['bootloader'] = True self.helper_flags['bootloader'] = bootloader
return True return True
break break
else: else:
for root, folders, uids in os.walk('/dev/disk/by-partuuid'): for root, folders, uids in os.walk('/dev/disk/by-partuuid'):
for uid in uids: for uid in uids:
real_path = os.path.realpath(os.path.join(root, uid)) real_path = os.path.realpath(os.path.join(root, uid))
if not os.path.basename(real_path) == os.path.basename(self.partition.path): continue if not os.path.basename(real_path) == os.path.basename(self.partition.path): continue
entry.write(f'options root=PARTUUID={uid} rw intel_pstate=no_hwp\n') entry.write(f'options root=PARTUUID={uid} rw intel_pstate=no_hwp\n')
self.helper_flags['bootloader'] = True self.helper_flags['bootloader'] = bootloader
return True return True
break break
raise RequirementError(f'Could not identify the UUID of {self.partition}, there for {self.mountpoint}/boot/loader/entries/arch.conf will be broken until fixed.') raise RequirementError(f"Could not identify the UUID of {self.partition}, there for {self.mountpoint}/boot/loader/entries/arch.conf will be broken until fixed.")
else:
raise RequirementError(f"Unknown (or not yet implemented) bootloader added to add_bootloader(): {bootloader}")
def add_additional_packages(self, *packages): def add_additional_packages(self, *packages):
return self.pacstrap(*packages) return self.pacstrap(*packages)