From f4a6d11373c61f77236f95b2a97f505c6eab55a2 Mon Sep 17 00:00:00 2001 From: Himadri Bhattacharjee Date: Sat, 16 Sep 2023 23:21:08 +0000 Subject: fix: make nodatacow and compress mutually exclusive (#1998) * fix: make nodatacow and compress mutually exclusive * fix: raise ValueError when both compress and nodatacow flags are set --- archinstall/lib/disk/device_model.py | 10 ++++++++-- archinstall/lib/disk/subvolume_menu.py | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py index 28ee3116..6eeb0d91 100644 --- a/archinstall/lib/disk/device_model.py +++ b/archinstall/lib/disk/device_model.py @@ -412,12 +412,18 @@ class SubvolumeModification: mountpoint = Path(entry['mountpoint']) if entry['mountpoint'] else None + compress = entry.get('compress', False) + nodatacow = entry.get('nodatacow', False) + + if compress and nodatacow: + raise ValueError('compress and nodatacow flags cannot be enabled simultaneously on a btfrs subvolume') + mods.append( SubvolumeModification( entry['name'], mountpoint, - entry.get('compress', False), - entry.get('nodatacow', False) + compress, + nodatacow ) ) diff --git a/archinstall/lib/disk/subvolume_menu.py b/archinstall/lib/disk/subvolume_menu.py index 32a0e616..2b70d7b2 100644 --- a/archinstall/lib/disk/subvolume_menu.py +++ b/archinstall/lib/disk/subvolume_menu.py @@ -46,7 +46,6 @@ class SubvolumeMenu(ListManager): ['nodatacow', 'compress'], skip=True, preset_values=preset_options, - multi=True ).run() if choice.type_ == MenuSelectionType.Selection: -- cgit v1.2.3-70-g09d2