Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-10-30 16:32:55 +0200
committerAnton Hvornum <anton@hvornum.se>2021-10-30 16:32:55 +0200
commitc2596be1f10cb766b9bd06a0ab637468b90b07e4 (patch)
tree9e82c9610ceacb6de32e5bef360bdd1937996625 /archinstall/lib/disk
parente6de28287dd149b37a41b8ddbcb35e28435536f7 (diff)
Added more logging (will change INFO to DEBUG later)
Diffstat (limited to 'archinstall/lib/disk')
-rw-r--r--archinstall/lib/disk/btrfs.py3
-rw-r--r--archinstall/lib/disk/helpers.py2
2 files changed, 3 insertions, 2 deletions
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