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

Added debugging to the btrfs functions.

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

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

@ -3,6 +3,7 @@ from typing import Union
from .helpers import get_mount_info from .helpers import get_mount_info
from ..exceptions import DiskError from ..exceptions import DiskError
from ..general import SysCommand from ..general import SysCommand
from ..output import log
def mount_subvolume(installation, location :Union[pathlib.Path, str], force=False) -> bool: def mount_subvolume(installation, location :Union[pathlib.Path, str], force=False) -> bool:
""" """
@ -22,6 +23,8 @@ def mount_subvolume(installation, location :Union[pathlib.Path, str], force=Fals
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)
print(get_mount_info(installation.target/location))
# Mount the logical volume to the physical structure # Mount the logical volume to the physical structure
mount_location = get_mount_info(installation.target/location)['source'] mount_location = get_mount_info(installation.target/location)['source']
SysCommand(f"umount {mount_location}") SysCommand(f"umount {mount_location}")
@ -34,5 +37,5 @@ def create_subvolume(installation, location :Union[pathlib.Path, str]) -> bool:
@installation: archinstall.Installer instance @installation: archinstall.Installer instance
@location: a localized string or path inside the installation / or /boot for instance without specifying /mnt/boot @location: a localized string or path inside the installation / or /boot for instance without specifying /mnt/boot
""" """
log(f"Creating a subvolume on {installation.target}/{str(location)}", level=logging.INFO)
SysCommand(f"btrfs subvolume create {installation.target}/{str(location)}") SysCommand(f"btrfs subvolume create {installation.target}/{str(location)}")