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

New tarball, no version change. This is only for bsds, added -k to swapctl to force kB block output.

Browse source
This commit is contained in:
inxi-svn 2014-09-20 18:02:55 +00:00
parent 2840e253f7
commit 36ea961bdb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
inxi
View file

@ -1891,7 +1891,7 @@ debug_data_collector()
gpart list &> $debug_data_dir/bsd-gpart-list.txt gpart list &> $debug_data_dir/bsd-gpart-list.txt
gpart show &> $debug_data_dir/bsd-gpart-show.txt gpart show &> $debug_data_dir/bsd-gpart-show.txt
gpart status &> $debug_data_dir/bsd-gpart-status.txt gpart status &> $debug_data_dir/bsd-gpart-status.txt
swapctl -l &> $debug_data_dir/bsd-swapctl-l.txt swapctl -l -k &> $debug_data_dir/bsd-swapctl-l-k.txt
swapon -s &> $debug_data_dir/swapon-s.txt swapon -s &> $debug_data_dir/swapon-s.txt
sysctl -b kern.geom.conftxt &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt sysctl -b kern.geom.conftxt &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt
sysctl -b kern.geom.confxml &> $debug_data_dir/bsd-sysctl-b-kern.geom.confxml.txt sysctl -b kern.geom.confxml &> $debug_data_dir/bsd-sysctl-b-kern.geom.confxml.txt
@ -5776,8 +5776,8 @@ get_hdd_data_basic()
else else
df_string='df -k' df_string='df -k'
fi fi
if swapctl -l &>/dev/null;then if swapctl -l -k &>/dev/null;then
swap_size=$( swapctl -l 2>/dev/null | gawk ' swap_size=$( swapctl -l -k 2>/dev/null | gawk '
BEGIN { BEGIN {
swapSize=0 swapSize=0
total=0 total=0
@ -7493,7 +7493,7 @@ get_partition_data()
--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs --exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs' --exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
else else
swap_data="$( swapctl -l 2>/dev/null )" swap_data="$( swapctl -l -k 2>/dev/null )"
# default size is 512, -H only for size in human readable format # default size is 512, -H only for size in human readable format
# older bsds don't support -T, pain, so we'll use partial output there # older bsds don't support -T, pain, so we'll use partial output there
if df -h -T &>/dev/null;then if df -h -T &>/dev/null;then
@ -8473,6 +8473,7 @@ get_raid_data_bsd()
/SIZE.*ALLOC/ { /SIZE.*ALLOC/ {
sub(/.*ALLOC.*/,"", $0) sub(/.*ALLOC.*/,"", $0)
} }
# gptid/d874c7e7-3f6d-11e4-b7dc-080027ea466c
/^[^[:space:]]/ { /^[^[:space:]]/ {
components="" components=""
separator="" separator=""