Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk/device_model.py
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall/lib/disk/device_model.py')
-rw-r--r--archinstall/lib/disk/device_model.py36
1 files changed, 7 insertions, 29 deletions
diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py
index d4563faa..423c65e4 100644
--- a/archinstall/lib/disk/device_model.py
+++ b/archinstall/lib/disk/device_model.py
@@ -315,6 +315,11 @@ class Size:
return self._normalize() >= other._normalize()
+class BtrfsMountOption(Enum):
+ compress = 'compress=zstd'
+ nodatacow = 'nodatacow'
+
+
@dataclass
class _BtrfsSubvolumeInfo:
name: Path
@@ -458,8 +463,6 @@ class _DeviceInfo:
class SubvolumeModification:
name: Path
mountpoint: Optional[Path] = None
- compress: bool = False
- nodatacow: bool = False
@classmethod
def from_existing_subvol_info(cls, info: _BtrfsSubvolumeInfo) -> SubvolumeModification:
@@ -475,31 +478,11 @@ 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,
- compress,
- nodatacow
- )
- )
+ mods.append(SubvolumeModification(entry['name'], mountpoint))
return mods
@property
- def mount_options(self) -> List[str]:
- options = []
- options += ['compress'] if self.compress else []
- options += ['nodatacow'] if self.nodatacow else []
- return options
-
- @property
def relative_mountpoint(self) -> Path:
"""
Will return the relative path based on the anchor
@@ -516,12 +499,7 @@ class SubvolumeModification:
return False
def json(self) -> Dict[str, Any]:
- return {
- 'name': str(self.name),
- 'mountpoint': str(self.mountpoint),
- 'compress': self.compress,
- 'nodatacow': self.nodatacow
- }
+ return {'name': str(self.name), 'mountpoint': str(self.mountpoint)}
def table_data(self) -> Dict[str, Any]:
return self.json()