X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=406f9b78776892fe5c3486fef591ca3a5f6fc76a;hb=fb0e3560121d35f1b430a3cf3fd93a2f7b920d6a;hp=65e7566b2ade611e1b194c65f9a3cf0a9a9a01a6;hpb=9b0e96beff6fbf9907acd0b96e61dfccfba49c9d;p=grml-hwinfo.git diff --git a/grml-hwinfo b/grml-hwinfo index 65e7566..406f9b7 100755 --- a/grml-hwinfo +++ b/grml-hwinfo @@ -12,7 +12,7 @@ # variables UNAME="$(uname -r)" -PN="$(basename $0)" +PN="$(basename "$0")" [ -n "$WORKING_DIR" -a -d "$WORKING_DIR" ] || WORKING_DIR=$(pwd) VERSION='***UNRELEASED***' @@ -23,13 +23,13 @@ export LC_ALL=C TIMESTAMP='+%F--%H-%M-%S-%Z' DATE="$(date $TIMESTAMP)" -echo "$PN ${VERSION} - collect hardware information" - # defaults GENERATE_FILE='1' GENERATE_DIRECTORY='' _opt_output_directory=false _opt_output_file=false +_opt_quiet=false +_opt_force=false usage() { echo " @@ -45,13 +45,15 @@ usage() { -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 + -q, --quiet Don't display informational text (useful for cron usage) + --force Don't abort but overwrite possibly existing output file --output-directory Store output files in specified directory - --output-file Store output in specified filename (tar.bz2 format) + --output-file Store output in specified filename (tar.XX format) " } -CMDLINE_OPTS=output-directory:,output-file:,both,directory,file,help -_opt_temp=$(getopt --name grml-hwinfo -o +bdfh --long $CMDLINE_OPTS -- "$@") +CMDLINE_OPTS=output-directory:,output-file:,both,directory,file,help,quiet,force +_opt_temp=$(getopt --name grml-hwinfo -o +bdfhq --long $CMDLINE_OPTS -- "$@") if [ $? -ne 0 ]; then echo "Try 'grml-hwinfo --help' for more information." >&2 exit 1 @@ -87,6 +89,12 @@ while :; do GENERATE_DIRECTORY='1' GENERATE_FILE='1' ;; + -q|--quiet) + _opt_quiet=true + ;; + --force) + _opt_force=true + ;; --) shift; break ;; @@ -98,21 +106,31 @@ while :; do shift done +if ! $_opt_quiet ; then + echo "$PN ${VERSION} - collect hardware information" +fi + # Generate output/temporary directory name & path, and output file path [ -n "$OUTDIRNAME" ] || OUTDIRNAME="grml-hwinfo-${DATE}" OUTDIR="${WORKING_DIR}/${OUTDIRNAME}" -mkdir "${OUTDIR}" || { echo 'Directory "'${OUTDIR}'" already exists, aborting.'>&2 ; exit 1; } +if $_opt_force ; then + mkdir -p "${OUTDIR}" +else + mkdir "${OUTDIR}" || { echo "Directory '${OUTDIR}' already exists, aborting." >&2 ; exit 1; } +fi if [ -n "$GENERATE_FILE" ] ; then [ -n "$OUTFILE" ] && OUTFILE_="$OUTFILE" || OUTFILE_="${OUTDIR}.tar.bz2" - [ -e "${OUTFILE_}" ] && { echo 'File "'${OUTFILE_}'" already exists, aborting.'>&2 ; rm -r "${OUTDIR}"; exit 1; } + if ! $_opt_force ; then + [ -e "${OUTFILE_}" ] && { echo "File '${OUTFILE_}' already exists, aborting." >&2 ; rm -r "${OUTDIR}"; exit 1; } + fi OUTFILE=${OUTFILE_} touch "${OUTFILE}" fi if [ "$(id -u)" != "0" ] ; then NOTROOT=1 - echo "W: Running without root permissions. Not all data will be collected." + $_opt_quiet || echo "W: Running without root permissions. Not all data will be collected." fi # check whether a binary is available and executable @@ -121,10 +139,12 @@ exectest() { echo 'Usage: exectest '>&2 return 1 else - if test -e "$(which $1)" ; then + if test -e "$(which "$1")" ; then return 0 else - grep -q "^$1"'$' missing_tools 2>/dev/null || echo "$1" >> missing_tools + if ! grep -q "^$1"'$' missing_tools 2>/dev/null ; then + $_opt_quiet || echo "$1" >> missing_tools + fi return 1 fi fi @@ -134,10 +154,10 @@ exectest() { # taken from http://cvs.debian.org/fai/lib/disk-info diskandsize() { local isdisk major minor blocks device suffix - while read major minor blocks device suffix; do + while read _ _ blocks device _ ; do isdisk=1 # skip ide cdrom - [ -f /proc/ide/$device/media ] && grep -q cdrom /proc/ide/$device/media && isdisk=0 + [ -f "/proc/ide/${device}/media" ] && grep -q cdrom "/proc/ide/${device}/media" && isdisk=0 [ "$isdisk" -eq 1 ] && echo "$device $blocks" done } @@ -145,9 +165,9 @@ diskandsize() { list_disks() { # print only every second entry; used by disk_info i=0 - for ent in $@; do + for ent in "$@" ; do if [ "$i" -eq 0 ]; then - echo $ent + echo "$ent" i=1 else i=0 @@ -157,60 +177,62 @@ list_disks() { disk_info() { # the variable holds a space separated list of devices and their block size - device_size=`grep -E ' cciss/c.d.$| ida/c.d.$| rd/c.d.$| hd.$| sd.$|/disc$' /proc/partitions | diskandsize` + device_size=$(grep -E ' cciss/c.d.$| ida/c.d.$| rd/c.d.$| hd.$| sd.$|/disc$' /proc/partitions | diskandsize) # a list of all local disks, without size - disklist=`list_disks $device_size` + disklist=$(list_disks "$device_size") } cd "${OUTDIR}" || exit 1 ( - [ -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..." + if ! $_opt_quiet ; then + [ -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..." + fi # some sysinfo - date > date + date > ./date if [ -r /etc/grml_version ] ; then cat /etc/grml_version > grml_version fi if [ -r /etc/debian_version ] ; then cat /etc/debian_version > debian_version fi - uname -a > uname + uname -a > ./uname # disks / devices [ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi > scsi - exectest lspci && lspci -nn > lspci + exectest lspci && lspci -nn > ./lspci cat /proc/partitions > partitions find /proc/ide/ -name geometry -exec grep . {} \; > proc_ide 2>/dev/null - df -h > df 2>/dev/null + df -h > ./df 2>/dev/null for i in free lsmod mount lsdev lspnp lsusb ; do - exectest $i && $i > $i + exectest $i && $i > ./$i done - swapon -s > swapon 2>swapon.error + swapon -s > ./swapon 2>./swapon.error # proc stuff for i in cpuinfo interrupts cmdline devices dma fb iomem ioports \ mdstat meminfo modules mtrr pci version ; do [ -r /proc/$i ] && cat /proc/$i > proc_$i done - exectest sysdump && sysdump > sysdump 2>sysdump.error + exectest sysdump && sysdump > ./sysdump 2>./sysdump.error # log dmesg > dmesg.cur # hwinfo - exectest discover && discover -v --type-summary --enable-bus all > discover 2> discover.2 + exectest discover && discover -v --type-summary --enable-bus all > ./discover 2>./discover.error exectest hwinfo && hwinfo log=hwinfo - exectest numactl && numactl --hardware > numactl - exectest x86info && x86info > x86info 2>x86info.2 - exectest lscpu && lscpu > lscpu + exectest numactl && numactl --hardware > ./numactl + exectest x86info && x86info > ./x86info 2>./x86info.error + exectest lscpu && lscpu > ./lscpu # net stuff, net-tools: - exectest ifconfig && ifconfig -v -a > ifconfig - exectest route && route -n > route + exectest ifconfig && ifconfig -v -a > ./ifconfig + exectest route && route -n > ./route # net stuff, iproute: exectest ip && ip addrlabel list > ip_addrlabel @@ -223,6 +245,11 @@ cd "${OUTDIR}" || exit 1 exectest ip && ip netns list > ip_netns exectest ip && ip ntable show > ip_ntable exectest ip && ip route show > ip_route + exectest ip && if [ -r /etc/iproute2/rt_tables ] ; then + grep -v '^#' /etc/iproute2/rt_tables | while read table _ ; do + ip route show table "${table}" > "ip_route_table_${table}" + done + fi exectest ip && ip rule show > ip_rule exectest ip && ip tunnel show > ip_tunnel exectest ip && ip tuntap show > ip_tuntap @@ -239,30 +266,30 @@ cd "${OUTDIR}" || exit 1 cat /proc/acpi/info > acpi_info fi - exectest acpi && acpi > acpi 2> acpi.error && acpi -v > acpi.version - [ -r /proc/apm/ ] && apm > apm + exectest acpi && acpi > ./acpi 2>acpi.error && acpi -v > ./acpi.version + [ -r /proc/apm/ ] && apm > ./apm if exectest mcelog ; then - mcelog > mcelog 2>mcelog.error + mcelog > ./mcelog 2>./mcelog.error fi # kernel stuff if [ -r /proc/config.gz ] ; then zcat /proc/config.gz > kernelconfig else - [ -r /boot/config-$UNAME ] && cat /boot/config-$UNAME > kernelconfig + [ -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 + 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 - exectest xvidtune && xvidtune -show > xdivtune - exectest xrandr && xrandr > xrandr - exectest xdpyinfo && xdpyinfo > xdpyinfo + exectest xviddetect && xviddetect > ./xviddetect + exectest xvidtune && xvidtune -show > ./xdivtune + exectest xrandr && xrandr > ./xrandr + exectest xdpyinfo && xdpyinfo > ./xdpyinfo X -version > x_version 2>&1 fi @@ -280,8 +307,8 @@ cd "${OUTDIR}" || exit 1 else echo "running as root" > root disk_info - exectest sfdisk && sfdisk -d > sfdisk 2>sfdisk.error - exectest dmidecode && dmidecode > dmidecode + exectest sfdisk && sfdisk -d > ./sfdisk 2>./sfdisk.error + exectest dmidecode && dmidecode > ./dmidecode exectest dconf && dconf -o dconf @@ -290,34 +317,36 @@ cd "${OUTDIR}" || exit 1 fi if exectest edac-util ; then - edac-util > edac-util 2>edac-util.error + edac-util > ./edac-util 2>./edac-util.error edac-util --report=full > edac-util_report 2>edac-util_report.error fi - if [ -x /usr/share/doc/lm-sensors/examples/eeprom/decode-dimms.pl ] ; then + if exectest decode-dimms ; then + decode-dimms > ./decode-dimms 2>./decode-dimms.error + elif [ -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 # proxmox - exectest qm && qm list > qm 2>qm.error + exectest qm && qm list > ./qm 2>./qm.error # libvirt - exectest virsh && virsh list >virsh 2>virsh.error + exectest virsh && virsh list >./virsh 2>./virsh.error # openvz - exectest vzlist && vzlist >vzlist 2>vzlist.error + exectest vzlist && vzlist >./vzlist 2>./vzlist.error # vserver - exectest vserver-stat && vserver-stat >vserver-stat 2>vserver-stat.error + exectest vserver-stat && vserver-stat >./vserver-stat 2>./vserver-stat.error - exectest mdadm && mdadm --detail /dev/md[0-9]* >> mdadm 2>mdadm.error + exectest mdadm && mdadm --detail /dev/md[0-9]* >> ./mdadm 2>./mdadm.error # LVM - exectest pvs && pvs > pvs 2>pvs.error - exectest vgs && vgs > vgs 2>vgs.error - exectest lvs && lvs > lvs 2>lvs.error - exectest lvdisplay && lvdisplay > lvdisplay 2>lvdisplay.error + exectest pvs && pvs > ./pvs 2>./pvs.error + exectest vgs && vgs > ./vgs 2>./vgs.error + exectest lvs && lvs > ./lvs 2>./lvs.error + exectest lvdisplay && lvdisplay > ./lvdisplay 2>./lvdisplay.error exectest dmsetup && dmsetup ls > dmsetup_ls 2>dmsetup_ls.error exectest dmsetup && dmsetup ls --tree > dmsetup_ls_tree 2>dmsetup_ls_tree.error - exectest lsblk && lsblk > lsblk 2>lsblk.error + exectest lsblk && lsblk > ./lsblk 2>./lsblk.error # iSCSI if exectest iscsiadm ; then @@ -330,65 +359,68 @@ cd "${OUTDIR}" || exit 1 fi if exectest lsscsi ; then - lsscsi > lsscsi 2>lsscsi.error - lsscsi -t > lsscsi_transport 2>lsscsi_transport.error + lsscsi > ./lsscsi 2>./lsscsi.error + lsscsi -t > ./lsscsi_transport 2>./lsscsi_transport.error fi for disk in $disklist; do if exectest smartctl ; then echo -e "smartctl -a /dev/${disk}:\n" >> smartctl - smartctl -a /dev/$disk >> smartctl - echo -e "\n\n" >> smartctl + smartctl -a "/dev/$disk" >> ./smartctl + echo -e "\n\n" >> ./smartctl fi if exectest hdparm ; then echo -e "hdparm -iv /dev/${disk}:\n" >> hdparm - hdparm -iv /dev/$disk >> hdparm + hdparm -iv "/dev/$disk" >> ./hdparm echo -e "\n\n" >> hdparm fi if exectest fdisk ; then echo -e "fdisk -lu /dev/${disk}:\n" >> fdisk - fdisk -lu /dev/$disk >>fdisk 2>>fdisk.error + fdisk -lu "/dev/$disk" >> ./fdisk 2>> ./fdisk.error echo -e "\n\n" >> fdisk fi if exectest parted ; then echo -e "parted -s /dev/${disk}:\n" >> parted - parted -s /dev/$disk print >> parted + parted -s "/dev/$disk" print >> ./parted echo -e "\n\n" >> parted fi if exectest sdparm ; then echo -e "sdparm --all --long /dev/${disk}:\n" >> sdparm - sdparm --all --long /dev/$disk >> sdparm + sdparm --all --long "/dev/$disk" >> ./sdparm echo -e "\n\n" >> sdparm fi 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 echo -e "\n\n" >> sg_inq fi - file -s /dev/$disk?* | grep -v ": empty" >> file_disk + file -s "/dev/${disk}"?* | grep -v ": empty" >> file_disk done fi ) # get rid of empty files for file in *.error ; do - test -s $file || rm $file + test -s "$file" || rm -- "$file" done -echo +$_opt_quiet || echo cd "${WORKING_DIR}" # create tarball if [ -n "$GENERATE_FILE" ] ; then tar acf "${OUTFILE}" "${OUTDIRNAME}" - [ -r "$OUTFILE" ] && echo "$OUTFILE ("$(ls -ahl "$OUTFILE" | awk '{print $5}')") has been generated." + if ! $_opt_quiet ; then + # shellcheck disable=SC2012 + [ -r "$OUTFILE" ] && echo "$OUTFILE ($(ls -ahl -- "$OUTFILE" | awk '{print $5}')) has been generated." + fi fi # remove (temporary) output directory if needed, else keep it, as it doubles @@ -396,7 +428,9 @@ fi if [ -z "$GENERATE_DIRECTORY" ] ; then rm -r "${OUTDIR}" else - [ -r "${OUTDIR}" ] && echo "${OUTDIR} has been generated." + if ! $_opt_quiet ; then + [ -r "${OUTDIR}" ] && echo "${OUTDIR} has been generated." + fi fi exit 0