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

Added more debugging

This commit is contained in:
Anton Hvornum 2022-02-09 11:51:19 +01:00
parent 45d37ad58d
commit 15b1fb26ce
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archinstall/lib/disk/filesystem.py
View File

@ -83,7 +83,6 @@ class Filesystem:
for partition in layout.get('partitions', []): for partition in layout.get('partitions', []):
# We don't want to re-add an existing partition (those containing a UUID already) # We don't want to re-add an existing partition (those containing a UUID already)
if partition.get('wipe', False) and not partition.get('PARTUUID', None): if partition.get('wipe', False) and not partition.get('PARTUUID', None):
print(_("Adding partition...."))
start = partition.get('start') or ( start = partition.get('start') or (
prev_partition and f'{prev_partition["device_instance"].end_sectors}s' or DEFAULT_PARTITION_START) prev_partition and f'{prev_partition["device_instance"].end_sectors}s' or DEFAULT_PARTITION_START)
partition['device_instance'] = self.add_partition(partition.get('type', 'primary'), partition['device_instance'] = self.add_partition(partition.get('type', 'primary'),

3
archinstall/lib/luks.py
View File

@ -181,7 +181,8 @@ class luks2:
if '/' in mountpoint: if '/' in mountpoint:
os.path.basename(mountpoint) # TODO: Raise exception instead? os.path.basename(mountpoint) # TODO: Raise exception instead?
cryptworker = SysCommandWorker(f'/usr/bin/cryptsetup open {partition.path} {mountpoint} --type luks2') print(f"Looking for phrase: 'Enter passphrase for {partition.path}'")
cryptworker = SysCommandWorker(f'/usr/bin/cryptsetup open {partition.path} {mountpoint} --type luks2', peak_output)
pw_given = False pw_given = False
while cryptworker.is_alive(): while cryptworker.is_alive():