From: Michael Prokop <mika@grml.org>
Date: Fri, 7 Jun 2024 09:26:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/11'
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=HEAD;hp=e436207fe18500d1ea6d5c22bda6e5b03061bef4;p=grml-hwinfo.git

Merge remote-tracking branch 'origin/github/pr/11'
---

diff --git a/debian/changelog b/debian/changelog
index f0637b4..15c6c18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-hwinfo (0.17.1) unstable; urgency=medium
+
+  [ Darshaka Pathirana ]
+  * [67431af] grml-hwinfo: Add inxi output
+  * [6356449] grml-hwinfo: Warn the user if grml-hwinfo is running
+    without X server
+
+ -- Michael Prokop <mika@grml.org>  Fri, 22 Sep 2023 18:42:30 +0200
+
 grml-hwinfo (0.17.0) unstable; urgency=medium
 
   [ Michael Prokop ]
diff --git a/grml-hwinfo b/grml-hwinfo
index 97ad572..6363778 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -459,8 +459,10 @@ cd "${OUTDIR}" || exit 1
 
       if exectest sdparm ; then
         echo -e "sdparm --all --long /dev/${disk}:\n" >> sdparm
-        sdparm --all --long "/dev/$disk" >> ./sdparm
+        echo -e "stderr for sdparm --all --long /dev/${disk}:\n" >> sdparm.error
+        sdparm --all --long "/dev/$disk" >> ./sdparm 2>> ./sdparm.error
         echo -e "\n\n" >> sdparm
+        echo -e "\n\n" >> sdparm.error
       fi
 
       if exectest sg_inq ; then