Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-07-03 14:00:03 +0200
committerAnton Hvornum <anton@hvornum.se>2021-07-03 14:00:03 +0200
commite965eaf546a73f76f5e928aa03154ff5c482fb4c (patch)
tree3afc9fecd9844f6c6cf1bd78f69a1c79c4d7f776 /archinstall
parent20e759d4cc60e78d8d769ec2239aab1b0233a59d (diff)
Missing .format() on 'use entire disk' step
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/disk.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 76871352..3bc2fa0f 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -810,14 +810,15 @@ class Filesystem:
if not partition.get('filesystem'):
partition['filesystem'] = {}
- while True:
- partition['filesystem']['format'] = input(f"Enter a valid fs-type for newly encrypted partition {partition['filesystem']['format']}: ").strip()
- if not partition['filesystem']['format'] or valid_fs_type(partition['filesystem']['format']) is False:
- pint("You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's.")
- continue
- break
-
- unlocked_device.format(partition['filesystem']['format'])
+ if not partition['filesystem'].get('format', False):
+ while True:
+ partition['filesystem']['format'] = input(f"Enter a valid fs-type for newly encrypted partition {partition['filesystem']['format']}: ").strip()
+ if not partition['filesystem']['format'] or valid_fs_type(partition['filesystem']['format']) is False:
+ pint("You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's.")
+ continue
+ break
+
+ unlocked_device.format(partition['filesystem']['format'])
elif partition.get('format', False):
partition['device_instance'].format(partition['filesystem']['format'])