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

Positions and kwargs not added to functions

This commit is contained in:
Anton Hvornum 2019-11-18 22:05:17 +00:00
parent 29b091e037
commit 755efe5706
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall.py
View File

@ -801,9 +801,7 @@ def refresh_partition_list(drive, *positionals, **kwargs):
return True
def mkfs_fat32(drive, partition, *positionals, **kwargs):
print(json.dumps(args, indent=4))
drive = args[drive]
print(partition, type(partition), args['partitions'], type(args['partitions']))
partition = args['partitions'][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:
@ -852,11 +850,11 @@ def mount_boot(drive, partition, mountpoint='/mnt/boot', *positionals, **kwargs)
o = b''.join(sys_command(f'/usr/bin/mount {drive}{partition} {mountpoint}'))
return True
def mount_mountpoints(drive, bootpartition, mountpoint='/mnt/boot'):
def mount_mountpoints(drive, bootpartition, mountpoint='/mnt/boot', *positionals, **kwargs):
drive = args[drive]
bootpartition = args[bootpartition]
mount_luksdev()
mount_boot(drive, bootpartition, mountpoint='/mnt/boot')
mount_luksdev(*positionals, **kwargs)
mount_boot(drive, bootpartition, mountpoint='/mnt/boot', *positionals, **kwargs)
if __name__ == '__main__':
update_git() # Breaks and restarts the script if an update was found.