dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-16 16:21:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix, corrected incorrect pattern that led to wrong drive listing

Browse source
This commit is contained in:
Harald Hope 2015-11-13 12:13:01 -08:00
parent c40a904294
commit efda1ecfec
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash
########################################################################
#### Script Name: inxi
#### Version: 2.2.30
#### Date: 2015-11-13
#### Version: 2.2.29
#### Date: 2015-11-09
#### Patch Number: 00
########################################################################
#### SPECIAL THANKS
@ -6082,7 +6082,7 @@ get_hdd_data_basic()
# also handles odd dm-1 type, from lvm, and mdraid, and some other bsd partition syntax
# note that linux 3.2.45-grsec-9th types kernels have this type of partition name: /dev/xvdc (no number, letter)
# note: btrfs does not seem to use partition integers, just the primary /dev/sdx identifier
# df can also show /dev/disk/(by-label|by-uuid etc). /dev/mmcblock0p3 is type of ssd
# df can also show /dev/disk/(by-label|by-uuid etc)
/^\/dev\/(disk\/|mapper\/|[hsv]d[a-z]+[0-9]*|dm[-]?[0-9]+|(ada|mmcblock)[0-9]+p[0-9]+.*|(ad|sd|wd)[0-9]+[a-z]|md[0-9]+|[aw]d[0-9]+s.*|xvd[a-z]+)|^ROOT/ {
# this handles the case where the first item is too long
# and makes df wrap output to next line, so here we advance
@ -6142,7 +6142,7 @@ get_hdd_data_basic()
if [[ $B_PARTITIONS_FILE == 'true' ]];then
A_HDD_DATA=( $(
gawk -v hddUsed=$hdd_used '
/[hsv]d[a-z]+|(ada|mmcblock)[0-9]+$/ {
/([hsv]d[a-z]+|(ada|mmcblock)[0-9]+)$/ {
driveSize = $(NF - 1)*1024/1000**3
gsub(/,/, " ", driveSize)
gsub(/^ +| +$/, "", driveSize)
@ -6154,7 +6154,7 @@ get_hdd_data_basic()
# }
# special case from this data: 8 0 156290904 sda
# note: vm has 252/253/254 known starter, grsec has 202
$1 ~ /^(3|8|22|33|202|252|253|254)$/ && $NF ~ /[hsv]d[a-z]+|(ada|mmcblock)[0-9]+$/ && ( $2 % 16 == 0 || $2 % 16 == 8 ) {
$1 ~ /^(3|8|22|33|202|252|253|254)$/ && $NF ~ /[hsv]d[a-z]+$/ && ( $2 % 16 == 0 || $2 % 16 == 8 ) {
size += $3
}
END {
@ -8095,7 +8095,7 @@ get_partition_data_advanced()
# if this works, great, otherwise, just set this to null values
partTemp="'$( readlink /dev/root 2>/dev/null )'"
if ( partTemp != "" ) {
if ( partTemp ~ /[hsv]d[a-z]+[0-9]{1,2}|(ada|mmcblock)[0-9]+p[0-9]+/ ) {
if ( partTemp ~ /[hsv]d[a-z]+[0-9]{1,2}/ ) {
partition=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, partTemp )
}
else if ( partTemp ~ /by-uuid/ ) {