Adding enforcement to select a filesystem-type for encrypted volumes unless the specified pasword can be used to unlock the device and auto-detect this.

This commit is contained in:
Anton Hvornum 2021-03-09 11:44:17 +01:00
parent 3b849ca074
commit 586f8bc32e
1 changed files with 6 additions and 0 deletions

View File

@ -137,6 +137,12 @@ if archinstall.arguments['harddrive'].has_partitions():
while 1:
new_filesystem = input(f"Enter a valid filesystem for {partition} (leave blank for {partition.filesystem}): ").strip(' ')
if len(new_filesystem) <= 0:
if partition.encrypted and partition.filesystem == 'crypto_LUKS':
if (autodetected_filesystem := partition.detect_inner_filesystem(archinstall.arguments.get('!encryption-password', None))):
else:
archinstall.log(f"Could not auto-detect the filesystem inside the encrypted volume.", fg='red')
archinstall.log(f"A filesystem must be defined for the unlocked encrypted partition.")
continue
break
# Since the potentially new filesystem is new