Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-04-16 11:48:24 +0200
committerAnton Hvornum <anton@hvornum.se>2021-04-16 11:48:24 +0200
commita7c0142099066791d48240815c47c07772f9e025 (patch)
treeb594661ce257f0e474750ff36fb94e34a23dc337
parent65c6807cc99a4c5bbd1ec8097b2472669475cf7d (diff)
Adding debug data to the log. It will now contain lsblk before and after the installation to help with detecting any potential information. Also removed a traceback log that was for debugging purposes.
-rw-r--r--archinstall/lib/disk.py10
-rw-r--r--examples/guided.py9
2 files changed, 16 insertions, 3 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index bada4076..c23bc6ac 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -222,7 +222,7 @@ class Partition():
def encrypted(self, value :bool):
if value:
log(f'Marking {self} as encrypted: {value}', level=LOG_LEVELS.Debug)
- log(f"Callstrack when marking the partition: {''.join(traceback.format_stack())}", level=LOG_LEVELS.Debug)
+ #log(f"Callstrack when marking the partition: {''.join(traceback.format_stack())}", level=LOG_LEVELS.Debug)
self._encrypted = value
@@ -611,3 +611,11 @@ def get_filesystem_type(path):
return b''.join(handle).strip().decode('UTF-8')
except SysCallError:
return None
+
+def disk_layouts():
+ try:
+ handle = sys_command(f"lsblk -f -o+TYPE,SIZE -J")
+ return json.loads(b''.join(handle).decode('UTF-8'))
+ except SysCallError as err:
+ log(f"Could not return disk layouts: {err}")
+ return None \ No newline at end of file
diff --git a/examples/guided.py b/examples/guided.py
index c0d22023..dc638d26 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -7,6 +7,9 @@ if hasUEFI() is False:
archinstall.log("ArchInstall currently only supports machines booted with UEFI.\nMBR & GRUB support is coming in version 2.2.0!", fg="red", level=archinstall.LOG_LEVELS.Error)
exit(1)
+# For support reasons, we'll log the disk layout pre installation to match against post-installation layout
+archinstall.log(f"Disk states before installing: {archinstall.disk_layouts()}", level=archinstall.LOG_LEVELS.Debug)
+
def ask_user_questions():
"""
First, we'll ask the user for a bunch of user input.
@@ -357,6 +360,8 @@ def perform_installation(mountpoint):
except:
pass
-ask_user_questions()
-perform_installation_steps()
+ # For support reasons, we'll log the disk layout post installation (crash or no crash)
+ archinstall.log(f"Disk states after installing: {archinstall.disk_layouts()}", level=archinstall.LOG_LEVELS.Debug)
+ask_user_questions()
+perform_installation_steps() \ No newline at end of file