Skip to content

Commit 6490f7d

Browse files
committed
Remove btrfs default structure prompt on default disk layout
1 parent 77558e2 commit 6490f7d

2 files changed

Lines changed: 19 additions & 13 deletions

File tree

archinstall/lib/global_menu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def _get_menu_options(self) -> list[MenuItem]:
131131
action=self._select_applications,
132132
value=[],
133133
preview_action=self._prev_applications,
134-
key='application_config',
134+
key='app_config',
135135
),
136136
MenuItem(
137137
text=tr('Kernels'),

archinstall/lib/interactions/disk_conf.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def get_default_partition_layout(
9292
device_modification = suggest_single_disk_layout(
9393
devices[0],
9494
filesystem_type=filesystem_type,
95+
prompt_btrfs_structure=False,
9596
)
9697
return [device_modification]
9798
else:
@@ -327,6 +328,7 @@ def suggest_single_disk_layout(
327328
device: BDevice,
328329
filesystem_type: FilesystemType | None = None,
329330
separate_home: bool | None = None,
331+
prompt_btrfs_structure: bool = True,
330332
) -> DeviceModification:
331333
if not filesystem_type:
332334
filesystem_type = select_main_filesystem_format()
@@ -337,19 +339,23 @@ def suggest_single_disk_layout(
337339
min_size_to_allow_home_part = Size(64, Unit.GiB, sector_size)
338340

339341
if filesystem_type == FilesystemType.Btrfs:
340-
prompt = tr('Would you like to use BTRFS subvolumes with a default structure?') + '\n'
341-
group = MenuItemGroup.yes_no()
342-
group.set_focus_by_value(MenuItem.yes().value)
343-
result = SelectMenu[bool](
344-
group,
345-
header=prompt,
346-
alignment=Alignment.CENTER,
347-
columns=2,
348-
orientation=Orientation.HORIZONTAL,
349-
allow_skip=False,
350-
).run()
342+
if prompt_btrfs_structure:
343+
prompt = tr('Would you like to use BTRFS subvolumes with a default structure?') + '\n'
344+
group = MenuItemGroup.yes_no()
345+
group.set_focus_by_value(MenuItem.yes().value)
346+
result = SelectMenu[bool](
347+
group,
348+
header=prompt,
349+
alignment=Alignment.CENTER,
350+
columns=2,
351+
orientation=Orientation.HORIZONTAL,
352+
allow_skip=False,
353+
).run()
354+
355+
using_subvolumes = result.item() == MenuItem.yes()
356+
else:
357+
using_subvolumes = True
351358

352-
using_subvolumes = result.item() == MenuItem.yes()
353359
mount_options = select_mount_options()
354360
else:
355361
using_subvolumes = False

0 commit comments

Comments
 (0)