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

Debugging

This commit is contained in:
Anton Hvornum 2019-11-28 00:14:53 +00:00
parent 93fb7f3ee5
commit 375976b7ce
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall.py
View File

@ -903,7 +903,9 @@ def encrypt_partition(drive, partition, keyfile='/tmp/diskpw', *positionals, **k
return True return True
def mkfs_btrfs(drive='/dev/mapper/luksdev', *positionals, **kwargs): def mkfs_btrfs(drive='/dev/mapper/luksdev', *positionals, **kwargs):
print('On drive:', drive)
o = b''.join(sys_command(f'/usr/bin/mkfs.btrfs -f {drive}')) o = b''.join(sys_command(f'/usr/bin/mkfs.btrfs -f {drive}'))
print(o)
if not b'UUID' in o: if not b'UUID' in o:
return False return False
return True return True
@ -1179,9 +1181,10 @@ if __name__ == '__main__':
# with open(args['pwfile'], 'r') as pw: # with open(args['pwfile'], 'r') as pw:
# PIN = pw.read().strip() # PIN = pw.read().strip()
print() if not args['skip-encrypt']:
print('[!] Disk PASSWORD is: {}'.format(args['password'])) print()
print() print('[!] Disk PASSWORD is: {}'.format(args['password']))
print()
if not args['rerun'] or args['ignore-rerun']: if not args['rerun'] or args['ignore-rerun']:
for i in range(5, 0, -1): for i in range(5, 0, -1):
@ -1224,7 +1227,7 @@ if __name__ == '__main__':
if args['skip-encrypt']: if args['skip-encrypt']:
on_part = f'{args["drive"]}/{args["partitions"]["2"]}' on_part = f'{args["drive"]}/{args["partitions"]["2"]}'
if not mkfs_btrfs(on_part): if not mkfs_btrfs(on_part):
print('[E] Could not setup btrfs filesystem.', o) print('[E] Could not setup btrfs filesystem.')
exit(1) exit(1)
mount_mountpoints('drive', '1') mount_mountpoints('drive', '1')