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

Forgot to include {installation.target} in subvolume mounting

This commit is contained in:
Anton Hvornum 2021-10-30 16:57:51 +02:00
parent c2596be1f1
commit 4bc164cccc
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/disk/btrfs.py
View File

@ -18,13 +18,13 @@ def mount_subvolume(installation, location :Union[pathlib.Path, str], force=Fals
if type(location) == str: if type(location) == str:
location = pathlib.Path(location) location = pathlib.Path(location)
if not location.exists(): if not (installation.target/location).exists():
location.mkdir(parents=True) (installation.target/location).mkdir(parents=True)
if glob.glob(str(installation.target/location/'*')) and force is False: if glob.glob(str(installation.target/location/'*')) and force is False:
raise DiskError(f"Cannot mount subvolume to {installation.target/location} because it contains data (non-empty folder target)") raise DiskError(f"Cannot mount subvolume to {installation.target/location} because it contains data (non-empty folder target)")
log(f"Mounting {location} as a subvolume", level=logging.INFO) log(f"Mounting {installation.target/location} as a subvolume", level=logging.INFO)
# Mount the logical volume to the physical structure # Mount the logical volume to the physical structure
mount_location = get_mount_info(installation.target/location, traverse=True)['source'] mount_location = get_mount_info(installation.target/location, traverse=True)['source']
SysCommand(f"umount {mount_location}") SysCommand(f"umount {mount_location}")