# 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
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)
}
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
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