X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=9b261c198ad94aee8e0effa1dd82f125838940f6;hb=34088327a8f5b5801d891a2014eeb17b6e7ae1e0;hp=f550be9b6b0bb88ca067ae686334ba49119911b6;hpb=04fe9e7da319512ef78b2d3b7d28a8b5e1170a2f;p=grml-hwinfo.git

diff --git a/grml-hwinfo b/grml-hwinfo
index f550be9..9b261c1 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -183,7 +183,6 @@ cd "${OUTDIR}" || exit 1
   if exectest dpkg ; then
      dpkg --get-selections   > dpkg_get_selections
      COLUMNS=300 dpkg --list > dpkg_list
-     COLUMNS=1000 dpkg -l linux-image-$UNAME | grep linux-image-$UNAME | tr -s ' ' > running_kernel
   fi
 
 # power management
@@ -199,6 +198,10 @@ cd "${OUTDIR}" || exit 1
      [ -r /boot/config-$UNAME ] && cat /boot/config-$UNAME > kernelconfig
   fi
 
+  exectest dpkg && COLUMNS=1000 dpkg -l linux-image-$UNAME \
+           | grep linux-image-$UNAME | tr -s ' ' > running_kernel 2>running_kernel.error
+  dpkg -S /boot/vmlinuz-$(uname -r) >> running_kernel 2>>running_kernel.error
+
 # X stuff
   if [ -n "${DISPLAY}" ] ; then
      exectest xviddetect  && xviddetect         > xviddetect
@@ -226,7 +229,6 @@ else
    echo "running as root" > root
    disk_info
    exectest sfdisk     && sfdisk -d > sfdisk 2>sfdisk.error
-   exectest ddcprobe   && ddcprobe  > ddcprobe
    exectest dmidecode  && dmidecode > dmidecode
 
    exectest dconf && dconf -o dconf
@@ -255,6 +257,11 @@ else
 fi
 )
 
+# get rid of empty files
+for file in *; do
+  test -s $file || rm $file
+done
+
 echo
 
 cd "${WORKING_DIR}"