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

Fetching partitions from the partition tree in the dictionary.

This commit is contained in:
Anton Hvornum 2019-11-18 21:36:12 +00:00
parent 3bcfd23b30
commit 9e322c0205
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall.py
View File

@ -799,7 +799,7 @@ def refresh_partition_list(drive, *positionals, **kwargs):
def mkfs_fat32(drive, partition, *positionals, **kwargs): def mkfs_fat32(drive, partition, *positionals, **kwargs):
drive = args[drive] drive = args[drive]
partition = args[partition] partition = args['paritions'][partition]
o = b''.join(sys_command(f'/usr/bin/mkfs.vfat -F32 {drive}{partition}')) o = b''.join(sys_command(f'/usr/bin/mkfs.vfat -F32 {drive}{partition}'))
if (b'mkfs.fat' not in o and b'mkfs.vfat' not in o) or b'command not found' in o: if (b'mkfs.fat' not in o and b'mkfs.vfat' not in o) or b'command not found' in o:
return None return None
@ -813,7 +813,7 @@ def is_luksdev_mounted(*positionals, **kwargs):
def mount_luktsdev(drive, partition, keyfile, *positionals, **kwargs): def mount_luktsdev(drive, partition, keyfile, *positionals, **kwargs):
drive = args[drive] drive = args[drive]
partition = args[partition] partition = args['paritions'][partition]
keyfile = args[keyfile] keyfile = args[keyfile]
if not is_luksdev_mounted(): if not is_luksdev_mounted():
o = b''.join(sys_command(f'/usr/bin/cryptsetup open {drive}{partition} luksdev --key-file {keyfile} --type luks2'.format(**args))) o = b''.join(sys_command(f'/usr/bin/cryptsetup open {drive}{partition} luksdev --key-file {keyfile} --type luks2'.format(**args)))
@ -821,7 +821,7 @@ def mount_luktsdev(drive, partition, keyfile, *positionals, **kwargs):
def encrypt_partition(drive, partition, keyfile='/tmp/diskpw', *positionals, **kwargs): def encrypt_partition(drive, partition, keyfile='/tmp/diskpw', *positionals, **kwargs):
drive = args[drive] drive = args[drive]
partition = args[partition] partition = args['paritions'][partition]
keyfile = args[keyfile] keyfile = args[keyfile]
o = b''.join(sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash sha512 --key-size 512 --iter-time 10000 --key-file {keyfile} --use-urandom luksFormat {drive}{partition}')) o = b''.join(sys_command(f'/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash sha512 --key-size 512 --iter-time 10000 --key-file {keyfile} --use-urandom luksFormat {drive}{partition}'))
if not b'Command successful.' in o: if not b'Command successful.' in o: