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

Removed the @.snapshots volume in order to support both Snapper and Timeshift #3363 (#3408)

This commit is contained in:
Anton Hvornum 2025-04-26 11:57:36 +02:00 committed by GitHub
parent fd92873ff7
commit 16e9bbe583
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/disk/device_handler.py
View File

@ -225,8 +225,8 @@ class DeviceHandler:
mountpoint = self._TMP_BTRFS_MOUNT mountpoint = self._TMP_BTRFS_MOUNT
else: else:
# when multiple subvolumes are mounted then the lsblk output may look like # when multiple subvolumes are mounted then the lsblk output may look like
# "mountpoint": "/mnt/archinstall/.snapshots" # "mountpoint": "/mnt/archinstall/var/log"
# "mountpoints": ["/mnt/archinstall/.snapshots", "/mnt/archinstall/home", ..] # "mountpoints": ["/mnt/archinstall/var/log", "/mnt/archinstall/home", ..]
# so we'll determine the minimum common path and assume that's the root # so we'll determine the minimum common path and assume that's the root
try: try:
common_path = os.path.commonpath(lsblk_info.mountpoints) common_path = os.path.commonpath(lsblk_info.mountpoints)

6
archinstall/lib/interactions/disk_conf.py
View File

@ -417,8 +417,7 @@ def suggest_single_disk_layout(
SubvolumeModification(Path('@'), Path('/')), SubvolumeModification(Path('@'), Path('/')),
SubvolumeModification(Path('@home'), Path('/home')), SubvolumeModification(Path('@home'), Path('/home')),
SubvolumeModification(Path('@log'), Path('/var/log')), SubvolumeModification(Path('@log'), Path('/var/log')),
SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg')), SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg'))
SubvolumeModification(Path('@.snapshots'), Path('/.snapshots'))
] ]
root_partition.btrfs_subvols = subvolumes root_partition.btrfs_subvols = subvolumes
elif using_home_partition: elif using_home_partition:
@ -596,8 +595,7 @@ def suggest_lvm_layout(
SubvolumeModification(Path('@'), Path('/')), SubvolumeModification(Path('@'), Path('/')),
SubvolumeModification(Path('@home'), Path('/home')), SubvolumeModification(Path('@home'), Path('/home')),
SubvolumeModification(Path('@log'), Path('/var/log')), SubvolumeModification(Path('@log'), Path('/var/log')),
SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg')), SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg'))
SubvolumeModification(Path('@.snapshots'), Path('/.snapshots')),
] ]
home_volume = False home_volume = False

4
docs/cli_parameters/config/disk_config.rst
View File

@ -200,10 +200,6 @@ This example contains both subvolumes and compression.
{ {
"mountpoint": "/var/cache/pacman/pkg", "mountpoint": "/var/cache/pacman/pkg",
"name": "@pkg", "name": "@pkg",
},
{
"mountpoint": "/.snapshots",
"name": "@.snapshots",
} }
], ],
"dev_path": null, "dev_path": null,

1
examples/disk_layouts-sample.json
View File

@ -16,7 +16,6 @@
{ {
"btrfs": { "btrfs": {
"subvolumes": { "subvolumes": {
"@.snapshots": "/.snapshots",
"@home": "/home", "@home": "/home",
"@log": "/var/log", "@log": "/var/log",
"@pkgs": "/var/cache/pacman/pkg" "@pkgs": "/var/cache/pacman/pkg"