projects
/
grml-hwinfo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysdump: ignore files inside /sys/kernel/debug to avoid hanging
[grml-hwinfo.git]
/
grml-hwinfo
diff --git
a/grml-hwinfo
b/grml-hwinfo
index
48b9676
..
72f79c0
100755
(executable)
--- a/
grml-hwinfo
+++ b/
grml-hwinfo
@@
-112,7
+112,12
@@
fi
# Generate output/temporary directory name & path, and output file path
[ -n "$OUTDIRNAME" ] || OUTDIRNAME="grml-hwinfo-${DATE}"
# Generate output/temporary directory name & path, and output file path
[ -n "$OUTDIRNAME" ] || OUTDIRNAME="grml-hwinfo-${DATE}"
-OUTDIR="${WORKING_DIR}/${OUTDIRNAME}"
+if $_opt_output_directory ; then
+ OUTDIR="${OUTDIRNAME}"
+else
+ OUTDIR="${WORKING_DIR}/${OUTDIRNAME}"
+fi
+
if $_opt_force ; then
mkdir -p "${OUTDIR}"
else
if $_opt_force ; then
mkdir -p "${OUTDIR}"
else
@@
-250,7
+255,11
@@
cd "${OUTDIR}" || exit 1
cat /proc/acpi/info > acpi_info
fi
cat /proc/acpi/info > acpi_info
fi
- exectest acpi && acpi > ./acpi 2>acpi.error && acpi -v > ./acpi.version
+ if exectest acpi ; then
+ acpi > ./acpi 2>acpi.error
+ acpi --everything > ./acpi.everything 2>./acpi.everything.error
+ acpi -v > ./acpi.version
+ fi
[ -r /proc/apm/ ] && apm > ./apm
if exectest mcelog ; then
[ -r /proc/apm/ ] && apm > ./apm
if exectest mcelog ; then
@@
-356,7
+365,7
@@
cd "${OUTDIR}" || exit 1
if exectest hdparm ; then
echo -e "hdparm -iv /dev/${disk}:\n" >> hdparm
if exectest hdparm ; then
echo -e "hdparm -iv /dev/${disk}:\n" >> hdparm
- hdparm -iv "/dev/$disk" >> ./hdparm
+ hdparm -iv "/dev/$disk" >> ./hdparm
2>> ./hdparm.error
echo -e "\n\n" >> hdparm
fi
echo -e "\n\n" >> hdparm
fi
@@
-380,7
+389,7
@@
cd "${OUTDIR}" || exit 1
if exectest sg_inq ; then
echo -e "sg_inq /dev/${disk}:\n" >> sg_inq
if exectest sg_inq ; then
echo -e "sg_inq /dev/${disk}:\n" >> sg_inq
- sg_inq "/dev/$disk" >> ./sg_inq
+ sg_inq "/dev/$disk" >> ./sg_inq
2>> ./sg_inq.error
echo -e "\n\n" >> sg_inq
fi
echo -e "\n\n" >> sg_inq
fi