X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml-hwinfo;h=fca9b8948d55b6ccb9a4f99e2452f8700b185dc9;hb=8c62e67422476e202e51048869b67ac1dc734e02;hp=f550be9b6b0bb88ca067ae686334ba49119911b6;hpb=04fe9e7da319512ef78b2d3b7d28a8b5e1170a2f;p=grml-hwinfo.git
diff --git a/grml-hwinfo b/grml-hwinfo
index f550be9..fca9b89 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -25,12 +25,14 @@ DATE="$(date $TIMESTAMP)"
echo "$PN ${VERSION} - collect hardware information"
+# defaults
GENERATE_FILE='1'
GENERATE_DIRECTORY=''
+_opt_output_directory=false
+_opt_output_file=false
-while getopts "hdf" args; do
- case "$args" in
- h) echo "
+usage() {
+ echo "
This tool collects information of the hardware this tool is being executed
on. It can be executed as normal user to collect some basic information or
with root permissions to collect as much information as possible. By
@@ -40,34 +42,70 @@ you can have it create a directory with all information.
Options:
- -h Display this help message
- -f Create grml-hwinfo-TIMESTAMP.tar.bz2
- -d Create grml-hwinfo-TIMESTAMP as a directory
- -df Create both, the directory and the file
+ -b, --both Create directory + file grml-hwinfo-TIMESTAMP.tar.bz2
+ -d, --directory Create grml-hwinfo-TIMESTAMP as a directory (no file)
+ -f, --file Create grml-hwinfo-TIMESTAMP.tar.bz2 [default action]
+ -h, --help Display this help message
+ --output-directory
Store output files in specified directory
+ --output-file Store output in specified filename (tar.bz2 format)
"
+}
- exit 0;;
-
- d)
- GENERATE_FILE=''
- GENERATE_DIRECTORY='1'
- ;;
-
- f) # generating file; default behaviour
- GENERATE_FILE='1'
- ;;
-
+CMDLINE_OPTS=output-directory:,output-file:,both,directory,file,help
+_opt_temp=$(getopt --name grml-hwinfo -o +bdfh --long $CMDLINE_OPTS -- "$@")
+if [ $? -ne 0 ]; then
+ echo "Try 'grml-hwinfo --help' for more information." >&2
+ exit 1
+fi
+eval set -- "$_opt_temp"
+
+while :; do
+ case "$1" in
+ --help|-h)
+ usage ; exit 0
+ ;;
+ --output-directory)
+ shift; OUTDIRNAME="$1"
+ GENERATE_DIRECTORY='1'
+ _opt_output_directory=true
+ $_opt_output_file && GENERATE_FILE='1' || GENERATE_FILE=''
+ ;;
+ --output-file)
+ shift; OUTFILE="$1"
+ GENERATE_FILE='1'
+ _opt_output_file=true
+ $_opt_output_directory && GENERATE_DIRECTORY='1' || GENERATE_DIRECTORY=''
+ ;;
+ -d|--directory)
+ GENERATE_DIRECTORY='1'
+ GENERATE_FILE=''
+ ;;
+ -f|--file)
+ GENERATE_DIRECTORY=''
+ GENERATE_FILE='1'
+ ;;
+ -b|--both)
+ GENERATE_DIRECTORY='1'
+ GENERATE_FILE='1'
+ ;;
+ --)
+ shift; break
+ ;;
+ *)
+ echo "Internal getopt error!" >&2
+ exit 1
+ ;;
esac
- done
+ shift
+done
# Generate output/temporary directory name & path, and output file path
-OUTFILE=""
-OUTDIRNAME="grml-hwinfo-${DATE}"
+[ -n "$OUTDIRNAME" ] || OUTDIRNAME="grml-hwinfo-${DATE}"
OUTDIR="${WORKING_DIR}/${OUTDIRNAME}"
mkdir "${OUTDIR}" || { echo 'Directory "'${OUTDIR}'" already exists, aborting.'>&2 ; exit 1; }
if [ -n "$GENERATE_FILE" ] ; then
- OUTFILE_="${OUTDIR}.tar.bz2"
+ [ -n "$OUTFILE" ] && OUTFILE_="$OUTFILE" || OUTFILE_="${OUTDIR}.tar.bz2"
[ -e "${OUTFILE_}" ] && { echo 'File "'${OUTFILE_}'" already exists, aborting.'>&2 ; rm -r "${OUTDIR}"; exit 1; }
OUTFILE=${OUTFILE_}
touch "${OUTFILE}"
@@ -183,7 +221,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 +236,10 @@ cd "${OUTDIR}" || exit 1
[ -r /boot/config-$UNAME ] && cat /boot/config-$UNAME > kernelconfig
fi
+ exectest dpkg && COLUMNS=1000 dpkg -l linux-image-$UNAME 2>running_kernel.error \
+ | 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 +267,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
@@ -235,6 +275,15 @@ else
/usr/share/doc/lm-sensors/examples/eeprom/decode-dimms.pl > decode-dimms 2>decode-dimms.error
fi
+ # proxmox
+ exectest qm && qm list > qm 2>qm.error
+ # libvirt
+ exectest virsh && virsh list >virsh 2>virsh.error
+ # openvz
+ exectest vzlist && vzlist >vzlist 2>vzlist.error
+ # vserver
+ exectest vserver-stat && vserver-stat >vserver-stat 2>vserver-stat.error
+
exectest mdadm && mdadm --detail /dev/md[0-9]* >> mdadm 2>mdadm.error
# LVM
@@ -255,6 +304,11 @@ else
fi
)
+# get rid of empty files
+for file in *; do
+ test -s $file || rm $file
+done
+
echo
cd "${WORKING_DIR}"