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

Added more logging (will change INFO to DEBUG later)

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

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

@ -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)") 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 {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 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}") SysCommand(f"umount {mount_location}")
return SysCommand(f"mount {mount_location} {installation.target}/{str(location)} -o subvol=@/{str(location)}").exit_code == 0 return SysCommand(f"mount {mount_location} {installation.target}/{str(location)} -o subvol=@/{str(location)}").exit_code == 0

2
archinstall/lib/disk/helpers.py
View File

@ -1,5 +1,6 @@
import re import re
import json import json
import logging
import pathlib import pathlib
from typing import Union from typing import Union
from .blockdevice import BlockDevice 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: 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))): for traversal in list(map(str, [str(path)] + list(pathlib.Path(str(path)).parents))):
try: try:
log(f"Getting mount information at location {traversal}", level=logging.INFO)
output = SysCommand(f'/usr/bin/findmnt --json {traversal}').decode('UTF-8') output = SysCommand(f'/usr/bin/findmnt --json {traversal}').decode('UTF-8')
if output: if output:
break break