From b68e41729332ac088015bb9e0d6ff665f498ebba Mon Sep 17 00:00:00 2001 From: Integral Date: Sun, 12 Jan 2025 00:07:49 +0800 Subject: [PATCH] chore: use native error messages from command output (#181) --- src/kernel/lkm.rs | 4 ++-- src/kernel/log.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kernel/lkm.rs b/src/kernel/lkm.rs index deec28e..ab0bc6d 100644 --- a/src/kernel/lkm.rs +++ b/src/kernel/lkm.rs @@ -294,8 +294,8 @@ impl KernelModules<'_> { self.current_info.stylize_data( Box::leak( util::exec_cmd("modinfo", &[&self.current_name]) - .unwrap_or_else(|_| { - String::from("module information not available") + .unwrap_or_else(|e| { + format!("module information not available: {e}") }) .replace("signature: ", "signature: \n") .into_boxed_str(), diff --git a/src/kernel/log.rs b/src/kernel/log.rs index c4c2f3f..ef11d00 100644 --- a/src/kernel/log.rs +++ b/src/kernel/log.rs @@ -19,7 +19,7 @@ impl KernelLogs { "dmesg", &["--kernel", "--human", "--ctime", "--color=never"], ) - .unwrap_or_else(|_| String::from("failed to retrieve dmesg output")); + .unwrap_or_else(|e| format!("failed to retrieve dmesg output: {e}")); let logs_updated = self.output.lines().next_back().unwrap_or_default() != self.last_line; self.last_line = self