Skip to content
Snippets Groups Projects
Commit dff9ac99 authored by Romain Dessort's avatar Romain Dessort
Browse files

Close #11273. Exclude partitions from device list

Use lsblk instead of sfdisk to get a list of block devices on the host.
parent 8f29e112
Branches
No related tags found
No related merge requests found
...@@ -107,6 +107,7 @@ getconf sysreportfile $parentdir/sysreport.txt ...@@ -107,6 +107,7 @@ getconf sysreportfile $parentdir/sysreport.txt
getconf SFDISK `which sfdisk` getconf SFDISK `which sfdisk`
getconf HWINFO `which hwinfo` getconf HWINFO `which hwinfo`
getconf LSBLK `which lsblk`
getconf sfdisk_options "" getconf sfdisk_options ""
getconf hwinfo_options "" getconf hwinfo_options ""
...@@ -607,7 +608,7 @@ fi ...@@ -607,7 +608,7 @@ fi
if [ "$partitions" == "yes" ]; then if [ "$partitions" == "yes" ]; then
if [ "$dosfdisk" == "yes" ]; then if [ "$dosfdisk" == "yes" ]; then
devices=`LC_ALL=C $SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1` devices=`LC_ALL=C $LSBLK --output NAME,TYPE --list --paths 2>/dev/null | grep "disk$" | @AWK@ '{print $1}'`
if [ "$devices" == "" ]; then if [ "$devices" == "" ]; then
warning "No harddisks found" warning "No harddisks found"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment