Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2019-11-18 22:05:17 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-18 22:05:17 +0000
commit755efe5706590dd096be551847855293c641df89 (patch)
tree1d3971f46d20294a3988178452bfb0c16a816864
parent29b091e0370bdde3a6955b8b646174436fad18b8 (diff)
Positions and kwargs not added to functions
-rw-r--r--archinstall.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/archinstall.py b/archinstall.py
index f2ed3a7a..00744044 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -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.