From 68212dd32cf10e263456ae69cead762731667775 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sat, 18 Sep 2021 14:54:42 +0200 Subject: Preparing to split up ./lib/disk.py And added some sane(?) defaults, which I'll massage into code some how. --- archinstall/lib/disk.py | 3 ++- archinstall/lib/disk2/btrfs.py | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 archinstall/lib/disk2/btrfs.py (limited to 'archinstall') diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 79a8d3c8..be5b9edb 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -7,6 +7,7 @@ from typing import Optional from .general import * from .hardware import has_uefi from .output import log +from .disk2 import btrfs # TODO: rename disk2 to disk, once we migrate all the code here into a structure ROOT_DIR_PATTERN = re.compile('^.*?/devices') GPT = 0b00000001 @@ -121,7 +122,7 @@ def disk_layout_filesystem_checks(layout): options['btrfs-subvolumes'] = input('Would you like to use BTRFS subvolumes? (Y/n)').strip().lower() in ('', 'y', 'yes') if options['btrfs-subvolumes']: - partition['filesystem']['subvolume'] = '@' # Detect /home etc, and set up sane defaults? + btrfs.create_subvolume(partition) def suggest_single_disk_layout(block_device, default_filesystem=None): if not default_filesystem: diff --git a/archinstall/lib/disk2/btrfs.py b/archinstall/lib/disk2/btrfs.py new file mode 100644 index 00000000..549d23c1 --- /dev/null +++ b/archinstall/lib/disk2/btrfs.py @@ -0,0 +1,9 @@ +def create_subvolume(partition): + if partition['mountpoint'] == '/': + partition['filesystem']['subvolume'] = '@' + elif partition['mountpoint'] == '/home': + partition['filesystem']['subvolume'] = '@home' + + # @.snapshots /.snapshots + # @log /var/log + # @pkg /var/cache/pacman/pkg \ No newline at end of file -- cgit v1.2.3-54-g00ecf