X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-hwinfo;h=75567b2a3339a174424f7cca6098af93b700effb;hb=refs%2Ftags%2Fv0.12.0;hp=f0bd2a9027ab0355140982c43f57d6e257f306dd;hpb=87551b7fca974481edae635433b554a629dc3671;p=grml-hwinfo.git
diff --git a/grml-hwinfo b/grml-hwinfo
index f0bd2a9..75567b2 100755
--- a/grml-hwinfo
+++ b/grml-hwinfo
@@ -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,36 @@ 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_output_directory ; then
+ OUTDIR="${OUTDIRNAME}"
+else
+ OUTDIR="${WORKING_DIR}/${OUTDIRNAME}"
+fi
+
+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
@@ -124,51 +147,39 @@ exectest() {
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
}
-# echo a list of all disks and their size
-# taken from http://cvs.debian.org/fai/lib/disk-info
-diskandsize() {
- local isdisk major minor blocks device suffix
- while read _ _ blocks device _ ; do
+# based on https://github.com/faiproject/fai/blob/master/lib/fai-disk-info
+checkdisk() {
+ local isdisk device
+ while read _ _ _ device _ ; do
isdisk=1
- # skip ide cdrom
- [ -f "/proc/ide/${device}/media" ] && grep -q cdrom "/proc/ide/${device}/media" && isdisk=0
- [ "$isdisk" -eq 1 ] && echo "$device $blocks"
- done
-}
-
-list_disks() {
- # print only every second entry; used by disk_info
- i=0
- for ent in "$@" ; do
- if [ "$i" -eq 0 ]; then
- echo "$ent"
- i=1
- else
- i=0
- fi
+ # skip CDROMs
+ [ "$(stat -c %G /dev/"${device}")" = "disk" ] || isdisk=0
+ [ "$isdisk" -eq 1 ] && echo "$device"
done
}
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)
- # a list of all local disks, without size
- disklist=$(list_disks "$device_size")
+ # the variable holds a newline separated list of devices
+ disklist=$(egrep ' etherd/e[[:digit:]]+\.[[:digit:]]+\b| i2o/hd.+\b| cciss/c.+d.+\b| ida/c.+d.+\b| rd/c.+d.+\b| fio.\b| hd.\b| sd[a-z]{1,2}\b|/disc\b| vd.\b| xvd.\b' /proc/partitions | checkdisk)
}
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
@@ -202,10 +213,10 @@ cd "${OUTDIR}" || exit 1
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 x86info && x86info > ./x86info 2>./x86info.error
exectest lscpu && lscpu > ./lscpu
# net stuff, net-tools:
@@ -388,15 +399,17 @@ for file in *.error ; do
test -s "$file" || rm -- "$file"
done
-echo
+$_opt_quiet || echo
cd "${WORKING_DIR}"
# create tarball
if [ -n "$GENERATE_FILE" ] ; then
tar acf "${OUTFILE}" "${OUTDIRNAME}"
- # shellcheck disable=SC2012
- [ -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
@@ -404,7 +417,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