Added creating and mounting of subvolume structure for BTRFS.

1 files changed, 14 insertions, 11 deletions

diff --git a/archinstall/lib/disk/user_guides.py b/archinstall/lib/disk/user_guides.py
index 79b9d48f..6f8a1edb 100644
--- a/archinstall/lib/disk/user_guides.py
+++ b/archinstall/lib/disk/user_guides.py
@@ -41,18 +41,21 @@ def suggest_single_disk_layout(block_device, default_filesystem=None):
 		}
 	})
 
-	if default_filesystem == 'btrfs' and input('Would you like to use BTRFS subvolumes? (Y/n)').strip().lower() in ('', 'y', 'yes'):
-		# https://btrfs.wiki.kernel.org/index.php/FAQ
-		# https://unix.stackexchange.com/questions/246976/btrfs-subvolume-uuid-clash
-		# https://github.com/classy-giraffe/easy-arch/blob/main/easy-arch.sh
-		layout[block_device.path]['partitions'][1]['btrfs'] = {
-			"subvolumes" : {
-				'@home' : '/home',
-				'@log' : '/var/log',
-				'@pkgs' : '/var/cache/pacman/pkg',
-				'@.snapshots' : '/.snapshots'
+	if default_filesystem == 'btrfs' and input('Would you like to use BTRFS subvolumes? (Y/n): ').strip().lower() in ('', 'y', 'yes'):
+		if input('Do you want to use a recommended structure? (Y/n): ').strip().lower() in ('', 'y', 'yes'):
+			# https://btrfs.wiki.kernel.org/index.php/FAQ
+			# https://unix.stackexchange.com/questions/246976/btrfs-subvolume-uuid-clash
+			# https://github.com/classy-giraffe/easy-arch/blob/main/easy-arch.sh
+			layout[block_device.path]['partitions'][1]['btrfs'] = {
+				"subvolumes" : {
+					'@home' : '/home',
+					'@log' : '/var/log',
+					'@pkgs' : '/var/cache/pacman/pkg',
+					'@.snapshots' : '/.snapshots'
+				}
 			}
-		}
+		else:
+			pass #... implement a guided setup
 
 	elif block_device.size >= MIN_SIZE_TO_ALLOW_HOME_PART:
 		# If we don't want to use subvolumes,