From 586f8bc32ef81695f31f10f41472443ad5f280cd Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 9 Mar 2021 11:44:17 +0100 Subject: 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. --- examples/guided.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'examples') diff --git a/examples/guided.py b/examples/guided.py index 722e1e36..3f57ec88 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -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 -- cgit v1.2.3-54-g00ecf