RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-phrased btrfs subvolume question to only allow for a default layout

This commit is contained in:
Anton Hvornum 2021-11-24 22:24:11 +01:00
parent bf9d53ae0b
commit 8bb631ad7f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
archinstall/lib/disk/user_guides.py
View File

@ -11,7 +11,7 @@ def suggest_single_disk_layout(block_device, default_filesystem=None, advanced_o
using_subvolumes = False using_subvolumes = False
if default_filesystem == 'btrfs': if default_filesystem == 'btrfs':
using_subvolumes = input('Would you like to use BTRFS subvolumes? (Y/n): ').strip().lower() in ('', 'y', 'yes') using_subvolumes = input('Would you like to use BTRFS subvolumes with a default structure? (Y/n): ').strip().lower() in ('', 'y', 'yes')
layout = { layout = {
block_device.path : { block_device.path : {
@ -54,20 +54,20 @@ def suggest_single_disk_layout(block_device, default_filesystem=None, advanced_o
layout[block_device.path]['partitions'][-1]['size'] = f"{min(block_device.size, 20)}GB" layout[block_device.path]['partitions'][-1]['size'] = f"{min(block_device.size, 20)}GB"
if default_filesystem == 'btrfs' and using_subvolumes: if default_filesystem == 'btrfs' and using_subvolumes:
if input('Do you want to use a recommended structure? (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://btrfs.wiki.kernel.org/index.php/FAQ
# https://unix.stackexchange.com/questions/246976/btrfs-subvolume-uuid-clash # https://unix.stackexchange.com/questions/246976/btrfs-subvolume-uuid-clash
# https://github.com/classy-giraffe/easy-arch/blob/main/easy-arch.sh # https://github.com/classy-giraffe/easy-arch/blob/main/easy-arch.sh
layout[block_device.path]['partitions'][1]['btrfs'] = { layout[block_device.path]['partitions'][1]['btrfs'] = {
"subvolumes" : { "subvolumes" : {
"@home" : "/home", "@home" : "/home",
"@log" : "/var/log", "@log" : "/var/log",
"@pkgs" : "/var/cache/pacman/pkg", "@pkgs" : "/var/cache/pacman/pkg",
"@.snapshots" : "/.snapshots" "@.snapshots" : "/.snapshots"
}
} }
else: }
pass # ... implement a guided setup # else:
# pass # ... implement a guided setup
elif block_device.size >= MIN_SIZE_TO_ALLOW_HOME_PART: elif block_device.size >= MIN_SIZE_TO_ALLOW_HOME_PART:
# If we don't want to use subvolumes, # If we don't want to use subvolumes,