diff --git a/inxi b/inxi index e771c1d..f80ac24 100755 --- a/inxi +++ b/inxi @@ -2,8 +2,8 @@ ######################################################################## #### Script Name: inxi #### version: 1.6.10 -#### Date: June 16 2011 -#### Patch Number: 00 +#### Date: June 17 2011 +#### Patch Number: 01 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -1316,7 +1316,7 @@ debug_data_collector() cat $FILE_MODULES &> $xiin_data_dir/proc-modules.txt check_recommends &> $xiin_data_dir/check-recommends.txt # note, only bash 4> supports ;;& for case, so using if/then here - if [[ $1 == 'sys' || $1 == 'all' ]];then + if [[ $1 == 'disk' || $1 == 'sys' || $1 == 'all' ]];then xiin_data_file=$SCRIPT_DATA_DIR/$xiin_data_dir/xiin-sys.txt echo 'Collecting networking data...' ifconfig &> $xiin_data_dir/ifconfig.txt @@ -1393,6 +1393,7 @@ debug_data_collector() cat $FILE_PARTITIONS &> $xiin_data_dir/proc-partitions.txt cat $FILE_SCSI &> $xiin_data_dir/proc-scsi.txt cat $FILE_MOUNTS &> $xiin_data_dir/proc-mounts.txt + cat /proc/sys/dev/cdrom/info &> $xiin_data_dir/proc-cdrom-info.txt cat /etc/fstab &> $xiin_data_dir/etc-fstab.txt cat /etc/mtab &> $xiin_data_dir/etc-mtab.txt inxi_args='pluo' @@ -2091,7 +2092,7 @@ show_options() print_screen_output "-v Script verbosity levels. Verbosity level number is required. Should not be used with -b or -F" print_screen_output " Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4" print_screen_output " 0 - Short output, same as: $SCRIPT_NAME" - print_screen_output " 1 - Basic verbose, same as: $SCRIPT_NAME -b" + print_screen_output " 1 - Basic verbose, -S + basic CPU + -G + basic Disk + -I. Same as: $SCRIPT_NAME -b" print_screen_output " 2 - Adds networking card (-N), Machine (-M) data, and shows basic hard disk data (names only)." print_screen_output " 3 - Adds advanced CPU (-C), network (-n) data, and switches on -x advanced data option." print_screen_output " 4 - Adds partition size/filled data (-P) for (if present):/, /home, /var/, /boot" @@ -2135,7 +2136,7 @@ show_options() print_screen_output " The following create a tar.gz file of system data, plus collecting the inxi output to file:" print_screen_output " 11 - With data file of xiin read of /sys." print_screen_output " 12 - With xorg conf and log data, xrandr, xprop, xdpyinfo, glxinfo etc." - print_screen_output " 13 - With data from dev, disks, partitions etc." + print_screen_output " 13 - With data from dev, disks, partitions, etc., plus xiin data file." print_screen_output " 14 - Everything, full data collection." if [[ $1 == 'full' ]];then print_screen_output " "