Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Torxed merged 1 commit into from
Apr 26, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions archinstall/lib/disk/device_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ def get_btrfs_info(
mountpoint = self._TMP_BTRFS_MOUNT
else:
# when multiple subvolumes are mounted then the lsblk output may look like
# "mountpoint": "/mnt/archinstall/.snapshots"
# "mountpoints": ["/mnt/archinstall/.snapshots", "/mnt/archinstall/home", ..]
# "mountpoint": "/mnt/archinstall/var/log"
# "mountpoints": ["/mnt/archinstall/var/log", "/mnt/archinstall/home", ..]
# so we'll determine the minimum common path and assume that's the root
try:
common_path = os.path.commonpath(lsblk_info.mountpoints)
Expand Down
6 changes: 2 additions & 4 deletions archinstall/lib/interactions/disk_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,7 @@ def suggest_single_disk_layout(
SubvolumeModification(Path('@'), Path('/')),
SubvolumeModification(Path('@home'), Path('/home')),
SubvolumeModification(Path('@log'), Path('/var/log')),
SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg')),
SubvolumeModification(Path('@.snapshots'), Path('/.snapshots'))
SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg'))
]
root_partition.btrfs_subvols = subvolumes
elif using_home_partition:
Expand Down Expand Up @@ -596,8 +595,7 @@ def suggest_lvm_layout(
SubvolumeModification(Path('@'), Path('/')),
SubvolumeModification(Path('@home'), Path('/home')),
SubvolumeModification(Path('@log'), Path('/var/log')),
SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg')),
SubvolumeModification(Path('@.snapshots'), Path('/.snapshots')),
SubvolumeModification(Path('@pkg'), Path('/var/cache/pacman/pkg'))
]

home_volume = False
Expand Down
4 changes: 0 additions & 4 deletions docs/cli_parameters/config/disk_config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,6 @@ This example contains both subvolumes and compression.
{
"mountpoint": "/var/cache/pacman/pkg",
"name": "@pkg",
},
{
"mountpoint": "/.snapshots",
"name": "@.snapshots",
}
],
"dev_path": null,
Expand Down
1 change: 0 additions & 1 deletion examples/disk_layouts-sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
{
"btrfs": {
"subvolumes": {
"@.snapshots": "/.snapshots",
"@home": "/home",
"@log": "/var/log",
"@pkgs": "/var/cache/pacman/pkg"
Expand Down
Loading