From c2596be1f10cb766b9bd06a0ab637468b90b07e4 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sat, 30 Oct 2021 16:32:55 +0200 Subject: Added more logging (will change INFO to DEBUG later) --- archinstall/lib/disk/btrfs.py | 3 +-- archinstall/lib/disk/helpers.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/disk/btrfs.py b/archinstall/lib/disk/btrfs.py index cf60095f..bf24f88b 100644 --- a/archinstall/lib/disk/btrfs.py +++ b/archinstall/lib/disk/btrfs.py @@ -25,9 +25,8 @@ def mount_subvolume(installation, location :Union[pathlib.Path, str], force=Fals 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, traverse=True)) # 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, traverse=True)['source'] SysCommand(f"umount {mount_location}") return SysCommand(f"mount {mount_location} {installation.target}/{str(location)} -o subvol=@/{str(location)}").exit_code == 0 diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py index 8a6d5a48..78bf08ed 100644 --- a/archinstall/lib/disk/helpers.py +++ b/archinstall/lib/disk/helpers.py @@ -1,5 +1,6 @@ import re import json +import logging import pathlib from typing import Union from .blockdevice import BlockDevice @@ -119,6 +120,7 @@ def harddrive(size=None, model=None, fuzzy=False): def get_mount_info(path :Union[pathlib.Path, str], traverse=False) -> dict: for traversal in list(map(str, [str(path)] + list(pathlib.Path(str(path)).parents))): try: + log(f"Getting mount information at location {traversal}", level=logging.INFO) output = SysCommand(f'/usr/bin/findmnt --json {traversal}').decode('UTF-8') if output: break -- cgit v1.2.3-70-g09d2