This commit is contained in:
parent
fd92873ff7
commit
16e9bbe583
|
|
@ -225,8 +225,8 @@ class DeviceHandler:
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
{
|
||||
"btrfs": {
|
||||
"subvolumes": {
|
||||
"@.snapshots": "/.snapshots",
|
||||
"@home": "/home",
|
||||
"@log": "/var/log",
|
||||
"@pkgs": "/var/cache/pacman/pkg"
|
||||
|
|
|
|||
Loading…
Reference in New Issue