second round

This commit is contained in:
inxi-svn 2008-12-03 21:27:46 +00:00
parent 0948495c69
commit 02c548a061

6
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.7.1-b1-t1 #### version: 0.7.1-b1-t2
#### Date: December 3 2008 #### Date: December 3 2008
######################################################################## ########################################################################
#### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif #### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif
@ -1929,10 +1929,10 @@ get_partition_data()
## the first field is too long, it will occupy its own line, this way we are getting only the needed data ## the first field is too long, it will occupy its own line, this way we are getting only the needed data
A_PARTITION_DATA=( $( df -h -T | gawk ' A_PARTITION_DATA=( $( df -h -T | gawk '
BEGIN { IGNORECASE=1 } BEGIN { IGNORECASE=1 }
/\/$|\/boot$|\/var$|\/home$/ && ! /aufs/ { /\/$|\/boot$|\/var$|\/home$|\/tmp$|\/usr$/ && ! /aufs/ {
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main" print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main"
} }
! /\/$|\/boot$|\/var$|\/home$|tmpfs|udev|^filesystem/ && ! /aufs/ { ! /\/$|\/boot$|\/var$|\/home$|\/tmp$|\/usr$|tmpfs|udev|^filesystem/ && ! /aufs/ {
print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary" print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary"
} }
' ) ' )