diff options
author | Unit 193 <unit193@ubuntu.com> | 2016-01-31 14:32:48 -0500 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2016-01-31 14:32:48 -0500 |
commit | 5bd9748185aeef8efaba55c7767bbdc598f8724b (patch) | |
tree | 46b50a68587b65579fb7301178385090022e1a47 | |
parent | f235875e5649d9b4b5b38b6ddcc50f451bc737b8 (diff) | |
download | inxi-5bd9748185aeef8efaba55c7767bbdc598f8724b.tar.bz2 inxi-5bd9748185aeef8efaba55c7767bbdc598f8724b.tar.xz inxi-5bd9748185aeef8efaba55c7767bbdc598f8724b.tar.zst |
Imported Upstream version 2.2.33upstream/2.2.33
-rwxr-xr-x | inxi | 38 | ||||
-rwxr-xr-x | inxi.changelog | 32 |
2 files changed, 47 insertions, 23 deletions
@@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.2.32 -#### Date: 2016-01-03 +#### Version: 2.2.33 +#### Date: 2016-01-30 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -20,7 +20,7 @@ #### Gaim/Pidgin, Weechat, KVIrc and Kopete. #### Original infobash author and copyright holder: #### Copyright (C) 2005-2007 Michiel de Boer a.k.a. locsmif -#### inxi version: Copyright (C) 2008-2015 Scott Rogers & Harald Hope +#### inxi version: Copyright (C) 2008-2016 Scott Rogers & Harald Hope #### Further fixes (listed as known): Horst Tritremmel <hjt at sidux.com> #### Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch #### Jarett.Stevens - dmidecde -M patch for older systems with the /sys @@ -293,6 +293,8 @@ B_DBUS_CLIENT='false' B_DCOP='false' # Debug flood override: make 'true' to allow long debug output B_DEBUG_FLOOD='false' +# for special -i debugging cases +B_DEBUG_I='false' B_DMIDECODE_SET='false' # show extra output data B_EXTRA_DATA='false' @@ -1649,7 +1651,11 @@ debug_data_collector() local Line='-------------------------' root_string='' local start_directory=$( pwd ) local host=$( tr '[A-Z]' '[a-z]' <<< "$HOSTNAME" ) - local downloader_error=0 + local downloader_error=0 debug_i='' + + if [[ $B_DEBUG_I == 'true' ]];then + debug_i='i' + fi if [[ -n $host ]];then host=${host// /-} @@ -1754,6 +1760,11 @@ debug_data_collector() lspci -mmnnv &> $debug_data_dir/lspci-mmnnv.txt lspci -v &> $debug_data_dir/lspci-v.txt lsusb &> $debug_data_dir/lsusb.txt + if type -p hciconfig &>/dev/null;then + hciconfig -a &> $debug_data_dir/hciconfig-a.txt + else + touch $debug_data_dir/hciconfig-absent + fi ls /sys &> $debug_data_dir/ls-sys.txt ps aux &> $debug_data_dir/ps-aux.txt ps -e &> $debug_data_dir/ps-e.txt @@ -2056,7 +2067,7 @@ debug_data_collector() echo 'Creating inxi output file now. This can take a few seconds...' echo "Starting $SCRIPT_NAME from: $start_directory" cd $start_directory - $SCRIPT_PATH/$SCRIPT_NAME -FRfrploudmxxx -c 0 -@ 8 -y 120 > $SCRIPT_DATA_DIR/$debug_data_dir/inxi-FRfrploudmxxxy120.txt + $SCRIPT_PATH/$SCRIPT_NAME -F${debug_i}Rfrploudmxxx -c 0 -@ 8 -y 120 > $SCRIPT_DATA_DIR/$debug_data_dir/inxi-F${debug_i}Rfrploudmxxxy120.txt cp $LOG_FILE $SCRIPT_DATA_DIR/$debug_data_dir if [[ -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz ]];then echo "Found and removing previous tar.gz data file: $debug_data_dir.tar.gz" @@ -2776,7 +2787,7 @@ get_parameters() LOGFE=$LOGFE_STRING create_rotate_logfiles # create/rotate logfiles before we do anything else ;; - 11|12|13|14) + 11|12|13|14|15) case $OPTARG in 11) debug_data_type='sys' @@ -2790,6 +2801,10 @@ get_parameters() 14) debug_data_type='all' ;; + 15) + debug_data_type='all' + B_DEBUG_I='true' + ;; esac initialize_data debug_data_collector $debug_data_type @@ -6088,7 +6103,7 @@ get_hdd_data_basic() # 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\/(disk\/|mapper\/|[hsv]d[a-z]+[0-9]*|dm[-]?[0-9]+|(ada|mmcblk)[0-9]+p[0-9]+.*|(ad|sd|wd)[0-9]+[a-z]|md[0-9]+|[aw]d[0-9]+s.*|xvd[a-z]+)|^ROOT/ { + /^\/dev\/(disk\/|mapper\/|[hsv]d[a-z]+[0-9]*|dm[-]?[0-9]+|(ada|mmcblk|nvme[0-9]+n)[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 # it to the next line for that single case. Using df -P should @@ -6147,7 +6162,7 @@ get_hdd_data_basic() if [[ $B_PARTITIONS_FILE == 'true' ]];then A_HDD_DATA=( $( gawk -v hddUsed=$hdd_used ' - /([hsv]d[a-z]+|(ada|mmcblk)[0-9]+)$/ { + /([hsv]d[a-z]+|(ada|mmcblk|nvme[0-9]+n)[0-9]+)$/ { driveSize = $(NF - 1)*1024/1000**3 gsub(/'"$BAN_LIST_ARRAY"'/, " ", driveSize) gsub(/^ +| +$/, "", driveSize) @@ -6377,8 +6392,8 @@ get_hard_drive_data_bsd() size=0 bSetSize="false" } - $1 ~ /^(ad|ada|mmcblk|sd|wd)[0-9]+(|[[:space:]]at.*)$/ { - diskId=gensub(/^((ad|ada|mmcblk|sd|wd)[0-9]+)[^0-9].*/,"\\1",1,$1) + $1 ~ /^(ad|ada|mmcblk|nvme[0-9]+n|sd|wd)[0-9]+(|[[:space:]]at.*)$/ { + diskId=gensub(/^((ad|ada|mmcblk|nvme[0-9]+n|sd|wd)[0-9]+)[^0-9].*/,"\\1",1,$1) # note: /var/run/dmesg.boot may repeat items since it is not created # fresh every boot, this way, only the last items will be used per disk id if (aIds[diskId] == "" ) { @@ -7545,7 +7560,6 @@ get_networking_local_ip_data() } # get_networking_local_ip_data;exit -# get_networking_local_ip_data;exit get_optical_drive_data() { eval $LOGFS @@ -12690,7 +12704,7 @@ print_networking_ip_data() if_ip=${a_interfaces_working[1]} fi fi - if_ip_string=" ${C1}ip$SEP3${C2} $if_ip" + if_ip_string=" ${C1}ip-v4$SEP3${C2} $if_ip" if [[ $B_EXTRA_DATA == 'true' ]];then if [[ -n ${a_interfaces_working[3]} ]];then if [[ $B_OUTPUT_FILTER == 'true' ]];then diff --git a/inxi.changelog b/inxi.changelog index 9736834..b4fece2 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,27 +1,37 @@ ===================================================================================== -Version: 2.2.32 +Version: 2.2.33 Patch Version: 00 -Script Date: 2016-01-03 +Script Date: 2016-01-30 ----------------------------------- Changes: ----------------------------------- -New version, new tarball. Finalized the * expansion fix for arrays. This is a significant -bug fix, so while the bug almost never appears, if it does, the inxi output can get completely -corrupted. +New version, new tarball. Bug fix: added basic support for NVMe M2 disk storage type. + +NOTE: missing product name/serial info, because it's not being treated by linux kernel +as a standard disk. Could not find that data anywhere in the system debugger dump. + +If you know how to find the model name/number and or serial, let me know. + +Also small fix, as noted: ip: should be ip-v4 to match with ip-v6, thanks mikaela. + +Also some debugger fixes and updates. + ----------------------------------- --- Harald Hope - Sun, 03 Jan 2016 14:08:04 -0800 +-- Harald Hope - Sat, 30 Jan 2016 17:07:42 -0800 + ===================================================================================== -Version: 2.2.31 +Version: 2.2.32 Patch Version: 00 -Script Date: 2015-12-30 +Script Date: 2016-01-03 ----------------------------------- Changes: ----------------------------------- -No version change til confirmed. New tarball. - +New version, new tarball. Finalized the * expansion fix for arrays. This is a significant +bug fix, so while the bug almost never appears, if it does, the inxi output can get completely +corrupted. ----------------------------------- --- Harald Hope - Wed, 30 Dec 2015 13:11:10 -0800 +-- Harald Hope - Sun, 03 Jan 2016 14:08:04 -0800 ===================================================================================== Version: 2.2.31 |