Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk/subvolume_menu.py
diff options
context:
space:
mode:
authorcodefiles <11915375+codefiles@users.noreply.github.com>2024-03-11 03:09:26 -0400
committerGitHub <noreply@github.com>2024-03-11 08:09:26 +0100
commitc210cdcb8f0883ac13a6ee22aebb8f01f3043e09 (patch)
tree2d6b33e57f8a9cfc1052bd6e8a231859acc194a3 /archinstall/lib/disk/subvolume_menu.py
parent1064f74846035afb3ffcf05e49d968d5da6d5521 (diff)
Fix Btrfs mount options (#2404)
Diffstat (limited to 'archinstall/lib/disk/subvolume_menu.py')
-rw-r--r--archinstall/lib/disk/subvolume_menu.py27
1 files changed, 2 insertions, 25 deletions
diff --git a/archinstall/lib/disk/subvolume_menu.py b/archinstall/lib/disk/subvolume_menu.py
index 2b70d7b2..48afa829 100644
--- a/archinstall/lib/disk/subvolume_menu.py
+++ b/archinstall/lib/disk/subvolume_menu.py
@@ -2,7 +2,7 @@ from pathlib import Path
from typing import Dict, List, Optional, Any, TYPE_CHECKING
from .device_model import SubvolumeModification
-from ..menu import Menu, TextInput, MenuSelectionType, ListManager
+from ..menu import TextInput, ListManager
from ..output import FormattedOutput
if TYPE_CHECKING:
@@ -36,23 +36,6 @@ class SubvolumeMenu(ListManager):
def selected_action_display(self, subvolume: SubvolumeModification) -> str:
return str(subvolume.name)
- def _prompt_options(self, editing: Optional[SubvolumeModification] = None) -> List[str]:
- preset_options = []
- if editing:
- preset_options = editing.mount_options
-
- choice = Menu(
- str(_("Select the desired subvolume options ")),
- ['nodatacow', 'compress'],
- skip=True,
- preset_values=preset_options,
- ).run()
-
- if choice.type_ == MenuSelectionType.Selection:
- return choice.value # type: ignore
-
- return []
-
def _add_subvolume(self, editing: Optional[SubvolumeModification] = None) -> Optional[SubvolumeModification]:
name = TextInput(f'\n\n{_("Subvolume name")}: ', editing.name if editing else '').run()
@@ -64,13 +47,7 @@ class SubvolumeMenu(ListManager):
if not mountpoint:
return None
- options = self._prompt_options(editing)
-
- subvolume = SubvolumeModification(Path(name), Path(mountpoint))
- subvolume.compress = 'compress' in options
- subvolume.nodatacow = 'nodatacow' in options
-
- return subvolume
+ return SubvolumeModification(Path(name), Path(mountpoint))
def handle_action(
self,