X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=795dfb55cc8fb6b5ffeabeea0eceeb8966231257;hb=24ef6ad2b12e2ed815f8075b4fd7f4a12c227c66;hp=b96d2e842b4614cecd6de302878ecff3112b0572;hpb=b7cd41bfdd638dd5306cc85cc8599677d7bf9e92;p=grml-hwinfo.git diff --git a/grml-hwinfo b/grml-hwinfo index b96d2e8..795dfb5 100755 --- a/grml-hwinfo +++ b/grml-hwinfo @@ -4,7 +4,6 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mon Jun 11 12:15:04 CEST 2007 [mika] ################################################################################ # Notice: Some ideas have been taken from # http://club.black.co.at/david/hwdb/infodump @@ -14,15 +13,69 @@ # variables UNAME="$(uname -r)" PN="$(basename $0)" -VERSION='0.3' +[ -n "$WORKING_DIR" -a -d "$WORKING_DIR" ] || WORKING_DIR=$(pwd) +VERSION='0.4.1' -[ -n "$INFOFILE" ] || INFOFILE='info.tar.bz2' +# data collection should not be affected by user locale +export LANG=C +export LC_ALL=C +TIMESTAMP='+%F--%H-%M-%S-%Z' +DATE="$(date $TIMESTAMP)" -if [ "$(id -u)" != 0 ] ; then +echo "$PN ${VERSION} - collect hardware information" + +GENERATE_FILE='1' +GENERATE_DIRECTORY='' + +while getopts "hdf" args; do + case "$args" in + h) 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 +default, a file named grml-hwinfo-TIMESTAMP.tar.bz2 storing all collected +information will be created in the current working directory. Alternatively, +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 +" + + exit 0;; + + d) + GENERATE_FILE='' + GENERATE_DIRECTORY='1' + ;; + + f) # generating file; default behaviour + GENERATE_FILE='1' + ;; + + esac + done + +# Generate output/temporary directory name & path, and output file path +OUTFILE="" +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" + [ -e "${OUTFILE_}" ] && { echo 'File "'${OUTFILE_}'" already exists, aborting.'>&2 ; rm -r "${OUTDIR}"; exit 1; } + OUTFILE=${OUTFILE_} + touch "${OUTFILE}" +fi + +if [ "$(id -u)" != "0" ] ; then NOTROOT=1 - echo "Notice: you are running $PN without root permissions! Not all information could be collected!" - echo + echo "W: Running without root permissions. Not all data will be collected." fi # check whether a binary is available and executable @@ -30,7 +83,7 @@ exectest() { if [ -z "$1" ] ; then echo 'Usage: exectest '>&2 return 1 -else +else test -e "$(which $1)" && return 0 || return 1 fi } @@ -67,15 +120,12 @@ disk_info() { disklist=`list_disks $device_size` } -echo "Running grml-hwinfo ${VERSION} - collecting hardware information." -echo "Please send feedback, bugreports, feature requests to Michael Prokop ." -echo "" -mkdir info || exit -1 +cd "${OUTDIR}" || exit 1 ( - cd info - - echo "Generating hardware information report using file $INFOFILE." + [ -n "$GENERATE_FILE" ] && echo "Output file: $OUTFILE" + [ -n "$GENERATE_DIRECTORY" ] && echo "Output directory: $OUTDIR" + echo echo "This might take a few seconds/minutes. Please be patient..." # some sysinfo @@ -114,6 +164,8 @@ mkdir info || exit -1 # hwinfo exectest discover && discover -v --type-summary --enable-bus all > discover 2> discover.2 exectest hwinfo && hwinfo log=hwinfo + exectest numactl && numactl --hardware > numactl + exectest x86info && x86info > x86info 2>x86info.2 # net stuff exectest ifconfig && ifconfig -v -a > ifconfig @@ -128,11 +180,11 @@ mkdir info || exit -1 COLUMNS=1000 dpkg -l linux-image-$UNAME | grep linux-image-$UNAME | tr -s ' ' > running_kernel fi -# powermanagement - exectest laptop-detect && laptop-detect 1>/dev/null 2>/dev/null && echo "0" > laptop_detected - exectest acpi_available && acpi_available && cat /proc/acpi/info > acpi_info - exectest acpi && acpi > acpi 2> acpi.error && acpi -v > acpi.version - [ -r /proc/apm/ ] && apm > acpi +# power management + exectest laptop-detect && laptop-detect >/dev/null 2>/dev/null && echo "0" > laptop_detected + exectest acpi_available && acpi_available && cat /proc/acpi/info > acpi_info + exectest acpi && acpi > acpi 2> acpi.error && acpi -v > acpi.version + [ -r /proc/apm/ ] && apm > apm # kernel stuff if [ -r /proc/config.gz ] ; then @@ -147,7 +199,7 @@ mkdir info || exit -1 exectest xvidtune && xvidtune -show > xdivtune exectest xrandr && xrandr > xrandr exectest xdpyinfo && xdpyinfo > xdpyinfo - X -version 1> x_version 2>&1 + X -version > x_version 2>&1 fi for i in Xorg.0.log Xorg.7.log Xorg.8.log XFree86.0.log XFree86.7.log XFree86.8.log dmesg ; do @@ -170,28 +222,41 @@ else exectest sfdisk && sfdisk -d > sfdisk 2>sfdisk.error exectest ddcprobe && ddcprobe > ddcprobe exectest dmidecode && dmidecode > dmidecode + + exectest dconf && dconf -o dconf + + if [ -x /usr/share/doc/lm-sensors/examples/eeprom/decode-dimms.pl ] ; then + /usr/share/doc/lm-sensors/examples/eeprom/decode-dimms.pl > decode-dimms 2>decode-dimms.error + fi + for disk in $disklist; do - exectest smartctl && smartctl -i /dev/$disk >> smartctl - exectest hdparm && hdparm -iv /dev/$disk >> hdparm - exectest fdisk && fdisk -lu /dev/$disk >> fdisk 2>>fdisk.error - exectest parted && parted -s /dev/$disk print >> parted - LC_ALL=C file -s /dev/$disk?* | grep -v ": empty" >> file_disk + exectest smartctl && echo "smartctl -a /dev/$disk :\n" >> smartctl && smartctl -a /dev/$disk >> smartctl && echo "\n\n" >> smartctl + exectest hdparm && echo "hdparm -iv /dev/$disk :\n" >> hdparm && hdparm -iv /dev/$disk >> hdparm && echo "\n\n" >> hdparm + exectest fdisk && echo "fdisk -lu /dev/$disk :\n" >> fdisk && fdisk -lu /dev/$disk >> fdisk 2>>fdisk.error && echo "\n\n" >> fdisk + exectest parted && echo "parted -s /dev/$disk :\n" >> parted && parted -s /dev/$disk print >> parted && echo "\n\n" >> parted + file -s /dev/$disk?* | grep -v ": empty" >> file_disk done fi ) -# finally create the tarball -if [ -f "$INFOFILE" ] ; then - DATE="$(date +%Y%m%d_%H:%M:%S)" - INFOFILE="info_$DATE.tar.bz2" - echo "Warning: $INFOFILE exists already, using $INFOFILE instead.">&1 - tar jcf $INFOFILE info/ && rm -Rf info/ +echo + +cd "${WORKING_DIR}" + +# create tarball +if [ -n "$GENERATE_FILE" ] ; then + tar jcf "${OUTFILE}" "${OUTDIRNAME}" + [ -r "$OUTFILE" ] && echo "$OUTFILE ("$(ls -ahl "$OUTFILE" | awk '{print $5}')") has been generated." +fi + +# remove (temporary) output directory if needed, else keep it, as it doubles +# as the real output directory. +if [ -z "$GENERATE_DIRECTORY" ] ; then + rm -r "${OUTDIR}" else - tar jcf $INFOFILE info/ && rm -Rf info/ + [ -r "${OUTDIR}" ] && echo "${OUTDIR} has been generated." fi -echo -[ -r "$INFOFILE" ] && echo "$INFOFILE ($(ls -ahl $INFOFILE | awk '{print $5}')) has been generated." -echo +exit 0 ## END OF FILE##################################################################