From c210cdcb8f0883ac13a6ee22aebb8f01f3043e09 Mon Sep 17 00:00:00 2001
From: codefiles <11915375+codefiles@users.noreply.github.com>
Date: Mon, 11 Mar 2024 03:09:26 -0400
Subject: Fix Btrfs mount options (#2404)

---
 archinstall/lib/interactions/disk_conf.py | 35 ++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'archinstall/lib/interactions')

diff --git a/archinstall/lib/interactions/disk_conf.py b/archinstall/lib/interactions/disk_conf.py
index 72a32311..9d0042d6 100644
--- a/archinstall/lib/interactions/disk_conf.py
+++ b/archinstall/lib/interactions/disk_conf.py
@@ -5,6 +5,7 @@ from typing import Any, TYPE_CHECKING
 from typing import Optional, List, Tuple
 
 from .. import disk
+from ..disk.device_model import BtrfsMountOption
 from ..hardware import SysInfo
 from ..menu import Menu
 from ..menu import TableMenu
@@ -214,6 +215,20 @@ def select_main_filesystem_format(advanced_options=False) -> disk.FilesystemType
 	return options[choice.single_value]
 
 
+def select_mount_options() -> List[str]:
+	prompt = str(_('Would you like to use compression or disable CoW?'))
+	options = [str(_('Use compression')), str(_('Disable Copy-on-Write'))]
+	choice = Menu(prompt, options, sort=False).run()
+
+	if choice.type_ == MenuSelectionType.Selection:
+		if choice.single_value == options[0]:
+			return [BtrfsMountOption.compress.value]
+		else:
+			return [BtrfsMountOption.nodatacow.value]
+
+	return []
+
+
 def suggest_single_disk_layout(
 	device: disk.BDevice,
 	filesystem_type: Optional[disk.FilesystemType] = None,
@@ -228,7 +243,7 @@ def suggest_single_disk_layout(
 	root_partition_size = disk.Size(20, disk.Unit.GiB, sector_size)
 	using_subvolumes = False
 	using_home_partition = False
-	compression = False
+	mount_options = []
 	device_size_gib = device.device_info.total_size
 
 	if filesystem_type == disk.FilesystemType.Btrfs:
@@ -236,9 +251,7 @@ def suggest_single_disk_layout(
 		choice = Menu(prompt, Menu.yes_no(), skip=False, default_option=Menu.yes()).run()
 		using_subvolumes = choice.value == Menu.yes()
 
-		prompt = str(_('Would you like to use BTRFS compression?'))
-		choice = Menu(prompt, Menu.yes_no(), skip=False, default_option=Menu.yes()).run()
-		compression = choice.value == Menu.yes()
+		mount_options = select_mount_options()
 
 	device_modification = disk.DeviceModification(device, wipe=True)
 
@@ -290,7 +303,7 @@ def suggest_single_disk_layout(
 		length=root_length,
 		mountpoint=Path('/') if not using_subvolumes else None,
 		fs_type=filesystem_type,
-		mount_options=['compress=zstd'] if compression else [],
+		mount_options=mount_options
 	)
 	device_modification.add_partition(root_partition)
 
@@ -323,7 +336,7 @@ def suggest_single_disk_layout(
 			length=home_length,
 			mountpoint=Path('/home'),
 			fs_type=filesystem_type,
-			mount_options=['compress=zstd'] if compression else []
+			mount_options=mount_options
 		)
 		device_modification.add_partition(home_partition)
 
@@ -344,7 +357,7 @@ def suggest_multi_disk_layout(
 	min_home_partition_size = disk.Size(40, disk.Unit.GiB, disk.SectorSize.default())
 	# rough estimate taking in to account user desktops etc. TODO: Catch user packages to detect size?
 	desired_root_partition_size = disk.Size(20, disk.Unit.GiB, disk.SectorSize.default())
-	compression = False
+	mount_options = []
 
 	if not filesystem_type:
 		filesystem_type = select_main_filesystem_format(advanced_options)
@@ -371,9 +384,7 @@ def suggest_multi_disk_layout(
 		return []
 
 	if filesystem_type == disk.FilesystemType.Btrfs:
-		prompt = str(_('Would you like to use BTRFS compression?'))
-		choice = Menu(prompt, Menu.yes_no(), skip=False, default_option=Menu.yes()).run()
-		compression = choice.value == Menu.yes()
+		mount_options = select_mount_options()
 
 	device_paths = ', '.join([str(d.device_info.path) for d in devices])
 
@@ -409,7 +420,7 @@ def suggest_multi_disk_layout(
 		start=root_start,
 		length=root_length,
 		mountpoint=Path('/'),
-		mount_options=['compress=zstd'] if compression else [],
+		mount_options=mount_options,
 		fs_type=filesystem_type
 	)
 	root_device_modification.add_partition(root_partition)
@@ -427,7 +438,7 @@ def suggest_multi_disk_layout(
 		start=home_start,
 		length=home_length,
 		mountpoint=Path('/home'),
-		mount_options=['compress=zstd'] if compression else [],
+		mount_options=mount_options,
 		fs_type=filesystem_type,
 	)
 	home_device_modification.add_partition(home_partition)
-- 
cgit v1.2.3-54-g00ecf