fi
}
-# based on https://github.com/faiproject/fai/blob/master/lib/fai-disk-info
-checkdisk() {
- local isdisk device
- while read _ _ _ device _ ; do
- isdisk=1
- # skip CDROMs
- [ "$(stat -c %G /dev/"${device}")" = "disk" ] || isdisk=0
- [ "$isdisk" -eq 1 ] && echo "$device"
- done
-}
-
disk_info() {
- # 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)
+ # the variable holds a newline separated list of disk block devices, excluding loopback and CD-ROM devices
+ disklist=$(lsblk -nd -o NAME -e 7,11)
}
exectest lscpu && lscpu -e > ./lscpu_extended
# EFI
- exectest efibootmgr && efibootmgr -v > efibootmgr
+ exectest efibootmgr && efibootmgr -v >efibootmgr 2>efibootmgr.error
# net stuff, net-tools:
exectest ifconfig && ifconfig -v -a > ./ifconfig
else
echo "running as root" > root
disk_info
- exectest sfdisk && sfdisk -d > ./sfdisk 2>./sfdisk.error
- exectest dmidecode && dmidecode > ./dmidecode
- exectest dconf && dconf -o dconf
+ exectest dmidecode && dmidecode > ./dmidecode
if exectest mcelog ; then
mcelog --dmi > mcelog_dmi 2>mcelog_dmi.error
fi
for disk in $disklist; do
+ if exectest sfdisk && [[ -b "/dev/${disk}" ]] ; then
+ sfdisk -d "/dev/${disk}" > "./sfdisk_${disk}" 2>"./sfdisk_${disk}.error"
+ fi
+
if exectest smartctl ; then
echo -e "smartctl -a /dev/${disk}:\n" >> smartctl
smartctl -a "/dev/$disk" >> ./smartctl