From bdb12380f359be278e74e474a0b3a579ddf2909f Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Mon, 2 Mar 2009 01:49:03 +0000 Subject: [PATCH] bug trapper --- inxi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inxi b/inxi index 53c62a3..c7d5278 100755 --- a/inxi +++ b/inxi @@ -2375,17 +2375,17 @@ get_partition_data() BEGIN { IGNORECASE=1 } - # this handles yet another fredforfaen special case where a mounted drive - # has the search string in its name - $NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ && ! /aufs/ { - print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main" - } # this is required because below we are subtracting from NF, so it has to be # > 1, actually greater than 4, but that is so unlikely to occur because # the real issue is long file system names that force the wrap of df output: //fileserver/main - ( NF == 1 ) { + ( NF < 5 ) && ( $0 !~ /[0-9]+\%/ ) { getline } + # this handles yet another fredforfaen special case where a mounted drive + # has the search string in its name + $NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ { + print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main" + } # skip all these, including the first, header line. Use the --exclude-type # to handle new filesystems types we do not want listed here $NF !~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$|^filesystem/ {