Skip to content

Remove btrfs default structure prompt on default disk layout #3615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
svartkanin wants to merge 1 commit into from
Closed

Remove btrfs default structure prompt on default disk layout #3615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion archinstall/lib/global_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def _get_menu_options(self) -> list[MenuItem]:
action=self._select_applications,
value=[],
preview_action=self._prev_applications,
key='application_config',
key='app_config',
),
MenuItem(
text=tr('Kernels'),
Expand Down
30 changes: 18 additions & 12 deletions archinstall/lib/interactions/disk_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def get_default_partition_layout(
device_modification = suggest_single_disk_layout(
devices[0],
filesystem_type=filesystem_type,
prompt_btrfs_structure=False,
)
return [device_modification]
else:
Expand Down Expand Up @@ -327,6 +328,7 @@ def suggest_single_disk_layout(
device: BDevice,
filesystem_type: FilesystemType | None = None,
separate_home: bool | None = None,
prompt_btrfs_structure: bool = True,
) -> DeviceModification:
if not filesystem_type:
filesystem_type = select_main_filesystem_format()
Expand All @@ -337,19 +339,23 @@ def suggest_single_disk_layout(
min_size_to_allow_home_part = Size(64, Unit.GiB, sector_size)

if filesystem_type == FilesystemType.Btrfs:
prompt = tr('Would you like to use BTRFS subvolumes with a default structure?') + '\n'
group = MenuItemGroup.yes_no()
group.set_focus_by_value(MenuItem.yes().value)
result = SelectMenu[bool](
group,
header=prompt,
alignment=Alignment.CENTER,
columns=2,
orientation=Orientation.HORIZONTAL,
allow_skip=False,
).run()
if prompt_btrfs_structure:
prompt = tr('Would you like to use BTRFS subvolumes with a default structure?') + '\n'
group = MenuItemGroup.yes_no()
group.set_focus_by_value(MenuItem.yes().value)
result = SelectMenu[bool](
group,
header=prompt,
alignment=Alignment.CENTER,
columns=2,
orientation=Orientation.HORIZONTAL,
allow_skip=False,
).run()

using_subvolumes = result.item() == MenuItem.yes()
else:
using_subvolumes = True

using_subvolumes = result.item() == MenuItem.yes()
mount_options = select_mount_options()
else:
using_subvolumes = False
Expand Down