From 908c7b8cc0a804e9522d93fcf0dc71034c53ccdb Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 3 Dec 2021 07:17:51 +1100 Subject: Add simple menu for better UX (#660) * Add simple menu for better UX * Add remove external dependency * Fix harddisk return value on skip * Table output for partitioning process * Switch partitioning to simple menu * fixup! Switch partitioning to simple menu * Ignoring complexity and binary operator issues Only in simple_menu.py * Added license text to the MIT licensed file * Added in versioning information * Fixed some imports and removed the last generic_select() from user_interaction. Also fixed a revert/merged fork of ask_for_main_filesystem_format() * Update color scheme to match Arch style better * Use cyan as default cursor color * Leave simple menu the same Co-authored-by: Daniel Girtler Co-authored-by: Anton Hvornum Co-authored-by: Dylan M. Taylor --- archinstall/lib/disk/validators.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'archinstall/lib/disk/validators.py') diff --git a/archinstall/lib/disk/validators.py b/archinstall/lib/disk/validators.py index e0ab6a86..464f0d73 100644 --- a/archinstall/lib/disk/validators.py +++ b/archinstall/lib/disk/validators.py @@ -16,7 +16,8 @@ def valid_parted_position(pos :str): return False -def valid_fs_type(fstype :str) -> bool: + +def fs_types(): # https://www.gnu.org/software/parted/manual/html_node/mkpart.html # Above link doesn't agree with `man parted` /mkpart documentation: """ @@ -27,16 +28,19 @@ def valid_fs_type(fstype :str) -> bool: "linux-swap", "ntfs", "reis‐ erfs", "udf", or "xfs". """ - - return fstype.lower() in [ + return [ "btrfs", "ext2", - "ext3", "ext4", # `man parted` allows these + "ext3", "ext4", # `man parted` allows these "fat16", "fat32", - "hfs", "hfs+", # "hfsx", not included in `man parted` + "hfs", "hfs+", # "hfsx", not included in `man parted` "linux-swap", "ntfs", "reiserfs", - "udf", # "ufs", not included in `man parted` - "xfs", # `man parted` allows this + "udf", # "ufs", not included in `man parted` + "xfs", # `man parted` allows this ] + + +def valid_fs_type(fstype :str) -> bool: + return fstype.lower() in fs_types() -- cgit v1.2.3-54-g00ecf