Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package supportutils for openSUSE:Factory checked in at 2022-03-09 18:47:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supportutils (Old) and /work/SRC/openSUSE:Factory/.supportutils.new.2349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supportutils" Wed Mar 9 18:47:26 2022 rev:30 rq:960265 version:3.1.20 Changes: -------- --- /work/SRC/openSUSE:Factory/supportutils/supportutils.changes 2022-01-11 21:23:55.945155608 +0100 +++ /work/SRC/openSUSE:Factory/.supportutils.new.2349/supportutils.changes 2022-03-11 11:36:24.182276908 +0100 @@ -1,0 +2,12 @@ +Fri Mar 4 17:56:15 UTC 2022 - Jason Record <[email protected]> + +- Changes to version 3.1.20 + + Added command blkid #114 + + Added s390x specific files and output #115 + + Fix for invalid argument during updates (bsc#1193204) + + Optimized conf_files, conf_files_text and log_cmd functions #118 + + Fixed iscsi initiator name (bsc#1195797) + + Added rpcinfo -p output #116 + + Included /etc/sssd/conf.d configuration files #100 + +------------------------------------------------------------------- Old: ---- supportutils-3.1.19.tar.gz New: ---- supportutils-3.1.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supportutils.spec ++++++ --- /var/tmp/diff_new_pack.Sj3HU4/_old 2022-03-11 11:36:24.626277429 +0100 +++ /var/tmp/diff_new_pack.Sj3HU4/_new 2022-03-11 11:36:24.634277438 +0100 @@ -19,7 +19,7 @@ %define support_libdir /usr/lib/supportconfig Name: supportutils -Version: 3.1.19 +Version: 3.1.20 Release: 0 Summary: Support Troubleshooting Tools License: GPL-2.0-only ++++++ supportutils-3.1.19.tar.gz -> supportutils-3.1.20.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1.19/bin/supportconfig new/supportutils-3.1.20/bin/supportconfig --- old/supportutils-3.1.19/bin/supportconfig 2022-01-10 23:36:26.446077091 +0100 +++ new/supportutils-3.1.20/bin/supportconfig 2022-02-10 19:13:23.665383112 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -SVER='3.1.11-29' -SDATE='2022 01 10' +SVER='3.1.11-29.1' +SDATE='2022 02 02' ############################################################################## # supportconfig - Gathers system troubleshooting information for SUSE Support @@ -45,6 +45,7 @@ echo "=============================================================================" echo " Support Utilities - Supportconfig" echo " Script Version: $SVER" + echo " Library Version: $RCVER" echo " Script Date: $SDATE" echo echo " Detailed system information and logs are collected and organized in a" @@ -739,7 +740,7 @@ log_cmd $OF "efibootmgr -v" fi if rpm -q s390-tools &> /dev/null; then - conf_files $OF /etc/zipl.conf + conf_files $OF /etc/zipl.conf /boot/zipl/active_devices.txt /boot/zipl/config fi test -e /usr/sbin/mcelog && log_cmd $OF "/usr/sbin/mcelog --ignorenodev --filter --dmi" @@ -832,41 +833,7 @@ SKIP=0 TIMEOUT=0 addHeaderFile $OF - if [ $SLES_VER -lt 110 ] && rpm_verify $OF rug - then - rpm_verify $OF lsb - RUG_VER=$(rpm -q rug | tail -1 | cut -d- -f2 | cut -d\. -f1) - log_cmd $OF 'date' - if [ $RUG_VER -gt 6 ]; then - # Time out as a group, if one rug command fails, all remaining rug commands fail - for CMDOPT in prefs '--no-abbrev sl' ca lu pch - do - if [ $TIMEOUT -ge 10 ]; then - log_write $OF "#==[ Command ]======================================#" - log_write $OF "# Skipped \"rug $CMDOPT\" due to previous timeout" - log_write $OF - else - timed_log_cmd $OF "rug $CMDOPT" - TIMEOUT=$? - fi - done - elif [ $RUG_VER -gt 1 ]; then - for CMDOPT in prefs '--no-abbrev sl' ch pl - do - if [ $TIMEOUT -ge 10 ]; then - log_write $OF "#==[ Command ]======================================#" - log_write $OF "# Skipped \"rug $CMDOPT\" due to previous timeout" - log_write $OF - else - timed_log_cmd $OF "rug $CMDOPT" - TIMEOUT=$? - fi - done - fi - fi - - TIMEOUT=0 - if [ $SLES_VER -ge 110 ] && rpm_verify $OF zypper; then + if (( SLES_VER >= 110 )) && rpm_verify $OF zypper; then log_cmd $OF 'date' log_cmd $OF 'ls -lA --time-style=long-iso /etc/products.d/' log_cmd $OF 'zypper locks' @@ -909,10 +876,9 @@ fi if rpm_verify $OF suseRegister; then - [ $SLES_VER -lt 110 ] && log_cmd $OF 'chkconfig suseRegister --list' FILES='/etc/suseRegister.conf /etc/sysconfig/suse_register' conf_files $OF $FILES - if [ -d /var/lib/suseRegister/ ]; then + if [[ -d /var/lib/suseRegister/ ]]; then FILES=$(find /var/lib/suseRegister/ -type f) conf_files $OF $FILES fi @@ -920,7 +886,7 @@ log_cmd $OF "env | grep -i proxy | grep -v CMDLINE" conf_files $OF /etc/sysconfig/proxy - if [ -s /root/.curlrc ]; then + if [[ -s /root/.curlrc ]]; then conf_files $OF /root/.curlrc SC_PROXY_PASS=$(grep -i "^proxy-user" /root/.curlrc | sed -e 's/"//g' | awk '{print $3}' | cut -d\: -f2) sed -i -e "s/:${SC_PROXY_PASS}$/:*REMOVED BY SUPPORTCONFIG*/g;s/:${SC_PROXY_PASS}\"$/:*REMOVED BY SUPPORTCONFIG*\"/g" $LOG/$OF @@ -968,19 +934,19 @@ #zypper FILES=$(find /var/log/ -type f -name \*zypp\*) - test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES + (( ADD_OPTION_LOGS > 0 )) && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES #suseregister log_files $OF 0 '/root/.suse_register.log' FILES="/var/log/messages" - [ $ADD_OPTION_LOGS -gt 0 ] && grep_log_files suse_register $OF 0 $FILES || grep_log_files suse_register $OF $VAR_OPTION_LINE_COUNT $FILES + (( ADD_OPTION_LOGS > 0 )) && grep_log_files suse_register $OF 0 $FILES || grep_log_files suse_register $OF $VAR_OPTION_LINE_COUNT $FILES if (( SLES_VER >= 120 )) then conf_files $OF '/proc/kgr_in_progress' log_entry $OF note "Processes blocking kGraft patching" FOUND=0 - for i in $(find /proc -type f | grep -i kgr_in_progress) + for i in $(find /proc -type f 2> /dev/null | grep -i kgr_in_progress) do VAL=$(cat $i 2>/dev/null) if [[ -n "$VAL" ]] @@ -1047,8 +1013,13 @@ check_service $OF sssd fi conf_files $OF "/etc/nsswitch.conf /etc/sssd/sssd.conf" + log_cmd $OF 'ls -lR --time-style=long-iso /etc/sssd/conf.d/' + if [[ -d /etc/sssd/conf.d ]]; then + FILES=$(find -L /etc/sssd/conf.d/ -type f | egrep "\.conf$") + conf_files $OF "$FILES" + fi SRVS_LDAP=$(grep "^[[:space:]]*ldap_uri" /etc/sssd/sssd.conf | cut -d= -f2 | sed -e 's/ *//g;s/,/ /g') - if [ -n "$SRVS_LDAP" ]; then + if [[ -n "$SRVS_LDAP" ]]; then for URI in $SRVS_LDAP do ADDR=$(echo $URI | awk -F\/ '{print $NF}' | cut -d\: -f1) @@ -1056,7 +1027,7 @@ done fi SRVS_KRB5=$(egrep "^[[:space:]]*krb5_server|^[[:space:]]*krb5_kdcip" /etc/sssd/sssd.conf | cut -d= -f2 | sed -e 's/ *//g;s/,/ /g') - if [ -n "$SRVS_KRB5" ]; then + if [[ -n "$SRVS_KRB5" ]]; then for URI in $SRVS_KRB5 do ADDR=$(echo $URI | awk -F\/ '{print $NF}' | cut -d\: -f1) @@ -1066,14 +1037,14 @@ log_cmd $OF 'date +"%Y-%m-%d %H:%M"' log_cmd $OF 'ls -lR --time-style=long-iso /var/lib/sss/' if (( SLES_VER < 120 )); then - [ -s /etc/init.d/sssd ] && SSSD_PIDF=$(grep '^PID_FILE' /etc/init.d/sssd | sed -e 's/ *//g' | cut -d= -f2) + [[ -s /etc/init.d/sssd ]] && SSSD_PIDF=$(grep '^PID_FILE' /etc/init.d/sssd | sed -e 's/ *//g' | cut -d= -f2) test -z "$SSSD_PIDF" && SLAPD_PIDF="/var/run/sssd.pid" - if [ -f $SSSD_PIDF ]; then + if [[ -f $SSSD_PIDF ]]; then SSSD_PID=$(cat $SSSD_PIDF) else SSSD_PID="" fi - if [ -n "$SSSD_PID" ]; then + if [[ -n "$SSSD_PID" ]]; then SSSD_PIDS=$(ps axwwo pid,ppid,cmd | grep ${SSSD_PID} | grep -v grep | awk '{print $1}' | sort -n) log_cmd $OF "ps axwwo user,pid,ppid,%cpu,%mem,vsz,rss,stat,time,cmd | egrep \"${SSSD_PID}|PPID\" | grep -v grep" for THISPID in $SSSD_PIDS @@ -1090,9 +1061,9 @@ fi log_cmd $OF 'grep pam_sss /etc/pam.d/*' FILES="/var/log/sssd/*" - [ $ADD_OPTION_LOGS -gt 0 ] && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES + (( ADD_OPTION_LOGS > 0 )) && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES FILES="/var/log/messages" - [ $ADD_OPTION_LOGS -gt 0 ] && grep_log_files ' sssd' $OF 0 $FILES || grep_log_files ' sssd' $OF $VAR_OPTION_LINE_COUNT $FILES + (( ADD_OPTION_LOGS > 0 )) && grep_log_files ' sssd' $OF 0 $FILES || grep_log_files ' sssd' $OF $VAR_OPTION_LINE_COUNT $FILES echolog Done else echolog Skipped @@ -1130,7 +1101,7 @@ log_cmd $OF 'vmcp query files' log_cmd $OF 'vmcp query userid' else - case $(uname -i) in + case $ARCH in s390x) log_write $OF "#==[ s390x Hardware Detected ]======================#" log_write $OF "# Consider loading vmcp for more info: modprobe vmcp" @@ -1537,7 +1508,7 @@ log_files $OF 0 /tmp/alsa-info.txt fi fi - if uname -i | grep ppc64 &> /dev/null #Readded from previous commit, including it now. + if grep ppc64 <<< $ARCH &> /dev/null #Readded from previous commit, including it now. then platform="" if grep PowerNV /proc/cpuinfo &> /dev/null; then @@ -1724,7 +1695,7 @@ log_cmd $OF "vmcp query lan details" log_cmd $OF "vmcp query vswitch detail" else - case $(uname -i) in + case $ARCH in s390x) log_write $OF "#==[ s390x Hardware Detected ]======================#" log_write $OF "# Consider loading vmcp for more info: modprobe vmcp" @@ -1868,6 +1839,7 @@ addHeaderFile $OF conf_files $OF /proc/partitions /etc/fstab log_cmd $OF "lsblk -i -o 'NAME,KNAME,MAJ:MIN,FSTYPE,LABEL,RO,RM,MODEL,SIZE,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,MOUNTPOINT,DISC-ALN,DISC-GRAN,DISC-MAX,DISC-ZERO'" + log_cmd $OF "blkid" [[ -x /usr/bin/findmnt ]] && log_cmd $OF "findmnt" log_cmd $OF "mount" conf_files $OF /proc/mounts /etc/mtab @@ -1899,7 +1871,7 @@ log_cmd $OF 'ls -l --time-style=long-iso /sys/block/' log_cmd $OF 'lslocks' - if [ $ADD_OPTION_MINDISK -eq 0 ]; then + if [[ $ADD_OPTION_MINDISK -eq 0 ]]; then log_cmd $OF 'iostat -x 1 4' log_cmd $OF 'sg_map -i -x' if [ -d /sys/block ]; then @@ -1913,7 +1885,7 @@ fi - if [ -n "$IDE_DISKS" -a -d /proc/ide ]; then + if [[ -n "$IDE_DISKS" ]] && [[ -d /proc/ide ]]; then log_write $OF "#==[ IDE Detailed Info ]============================#" log_write $OF "#---------------------------------------------------#" FILES=$(find /proc/ide/ -maxdepth 1 -type f 2>/dev/null) @@ -1929,7 +1901,7 @@ fi fi - if [ -n "$SCSI_DISKS" ]; then + if [[ -n "$SCSI_DISKS" ]]; then log_write $OF "#==[ SCSI Detailed Info ]===========================#" log_write $OF "#---------------------------------------------------#" log_cmd $OF 'lsscsi' @@ -1952,7 +1924,7 @@ done fi - if [ -n "$CCISS_DISKS" -a -d /proc/driver/cciss ]; then + if [[ -n "$CCISS_DISKS" ]] && [[ -d /proc/driver/cciss ]]; then log_write $OF "#==[ CCISS Detailed Info ]==========================#" log_write $OF "#---------------------------------------------------#" FILES=$(find /proc/driver/cciss/ -maxdepth 1 -type f 2>/dev/null) @@ -1968,6 +1940,14 @@ fi fi fi + if [[ "$ARCH" == "s390x" ]] ; then + log_write $OF "#==[ s390x and DASD Info ]==========================#" + log_write $OF "#---------------------------------------------------#" + log_cmd $OF 'lsdasd -a' + log_cmd $OF 'lsdasd --long' + log_cmd $OF 'rpm -V s390-tools' + fi + echolog Done } @@ -2044,8 +2024,7 @@ log_cmd $OF 'systemctl status iscsi.service' log_cmd $OF 'systemctl status iscsid.service' log_cmd $OF 'systemctl status iscsid.socket' - log_cmd $OF 'iscsi-iname' - conf_files $OF /etc/iscsid.conf + conf_files $OF "/etc/iscsi/initiatorname.iscsi /etc/iscsi/iscsid.conf" log_cmd $OF 'iscsiadm -m session' if log_cmd $OF 'iscsiadm -m node' then @@ -2079,6 +2058,7 @@ check_service $OF nfsserver NFS_STATUS=$? fi + timed_log_cmd $OF 'rpcinfo -p' log_cmd $OF 'exportfs -v' log_cmd $OF 'nfsstat' if timed_log_cmd $OF 'showmount' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1.19/bin/supportconfig.rc new/supportutils-3.1.20/bin/supportconfig.rc --- old/supportutils-3.1.19/bin/supportconfig.rc 2022-01-07 21:43:13.936226127 +0100 +++ new/supportutils-3.1.20/bin/supportconfig.rc 2022-02-10 17:17:13.974427779 +0100 @@ -1,6 +1,7 @@ ############################################################################## # supportconfig.rc - Resource file for supportconfig # Copyright (C) 2001-2022 SUSE LLC +RCVER='3.1.11-29.2' # # Contains supporting functions and variables used by supportconfig and # supportconfig plugins. @@ -19,7 +20,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. # -# Modified: 2022 Jan 07 +# Modified: 2022 Feb 02 # Authors/Contributors: # Jason Record <[email protected]> # @@ -252,10 +253,12 @@ conf_text_files() { LOGFILE=$LOG/$1 shift - for CONF in $@ + FILES=$@ + set dummy-argument + for CONF in $FILES do echo "#==[ Configuration File ]===========================#" >> $LOGFILE - if [ -f $CONF ]; then + if [[ -f $CONF ]]; then echo "# $CONF" >> $LOGFILE TEXTFILE=$(file -L $CONF | egrep -i "text|empty|XML") if [ -z "$TEXTFILE" ]; then @@ -264,9 +267,9 @@ else wait_trace_on "$CONF" if (( ADD_OPTION_LOGS )); then - cat $CONF 2>> $LOG/$CSFILE | sed -e 's/\r//g' >> $LOGFILE 2>> $LOG/$CSFILE + sed -e 's/\r//g' $CONF >> $LOGFILE 2>> $LOG/$CSFILE else - cat $CONF 2>> $LOG/$CSFILE | sed -e '/^[[:space:]]*#/d' -e '/^[[:space:]]*;/d' -e '/^[[:space:]]*\/\//d' -e 's/\r//g' -e '/^$/d' >> $LOGFILE 2>> $LOG/$CSFILE + sed -e '/^[[:space:]]*#/d' -e '/^[[:space:]]*;/d' -e '/^[[:space:]]*\/\//d' -e 's/\r//g' -e '/^$/d' $CONF >> $LOGFILE 2>> $LOG/$CSFILE fi wait_trace_off fi @@ -282,16 +285,18 @@ conf_files() { LOGFILE=$LOG/$1 shift - for CONF in $@ + FILES=$@ + set dummy-argument + for CONF in $FILES do echo "#==[ Configuration File ]===========================#" >> $LOGFILE - if [ -f $CONF ]; then + if [[ -f $CONF ]]; then echo "# $CONF" >> $LOGFILE wait_trace_on "$CONF" if (( ADD_OPTION_LOGS )); then - cat $CONF 2>> $LOG/$CSFILE | sed -e 's/\r//g' >> $LOGFILE 2>> $LOG/$CSFILE + sed -e 's/\r//g' $CONF >> $LOGFILE 2>> $LOG/$CSFILE else - cat $CONF 2>> $LOG/$CSFILE | sed -e '/^[[:space:]]*#/d;/^[[:space:]]*;/d;s/\r//g;/^[[:space:]]*$/d' >> $LOGFILE 2>> $LOG/$CSFILE + sed -e '/^[[:space:]]*#/d;/^[[:space:]]*;/d;s/\r//g;/^[[:space:]]*$/d' $CONF >> $LOGFILE 2>> $LOG/$CSFILE fi echo >> $LOGFILE wait_trace_off @@ -460,31 +465,36 @@ test $VAR_OPTION_SILENT -gt 0 && printf " %-40s %12s ... " "$1" "$2" >> $CSLOGFILE || printf " %-40s %12s ... " "$1" "$2" | tee -a $CSLOGFILE } -# Input: logfilename command -log_cmd() { +_log_cmd() { EXIT_STATUS=0 - LOGFILE=$LOG/$1 shift - CMDLINE_ORIG="$@" - CMDBIN=$(echo $CMDLINE_ORIG | awk '{print $1}') - CMD=$(\which $CMDBIN 2>/dev/null | awk '{print $1}') - echo "#==[ Command ]======================================#" >> $LOGFILE - if [ -x "$CMD" ]; then - CMDLINE=$(echo $CMDLINE_ORIG | sed -e "s!${CMDBIN}!${CMD}!") - echo "# $CMDLINE" >> $LOGFILE - wait_trace_on "$CMDLINE" - echo "$CMDLINE" | bash >> $LOGFILE 2>&1 + CMDLINE=($@) + CMDBIN=${CMDLINE[0]} + CMD=($(command -v $CMDBIN)) + echo "#==[ Command ]======================================#" + if [[ -x "${CMD[0]}" ]]; then + CMDLINE[0]="${CMD[0]}" + echo "# ${CMDLINE[@]}" + wait_trace_on "${CMDLINE[@]}" + bash -c "${CMDLINE[*]}" 2>&1 EXIT_STATUS=$? wait_trace_off else - echo "# $CMDLINE_ORIG" >> $LOGFILE - echo "ERROR: Command not found or not executable" >> $LOGFILE + echo "# ${CMDLINE[@]}" + echo "ERROR: Command not found or not executable" EXIT_STATUS=1 fi - echo >> $LOGFILE + echo return $EXIT_STATUS } + + +log_cmd() { + LOGFILE=$LOG/$1 + _log_cmd "$@" >> $LOGFILE +} + # Input: logfilename command # Returns: 1 - command not found or not executable # 2 - command returned an error @@ -1346,7 +1356,7 @@ else xml_write 'hostname' "$(hostname 2>/dev/null)" fi - xml_write 'arch' "$(uname -i)" + xml_write 'arch' "$ARCH" xml_write 'kernel' "$(uname -r)" if [[ -s /etc/os-release ]]; then if rpm -q 'SUSE_SLES_SAP-release' &>/dev/null; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1.19/spec/supportutils.changes new/supportutils-3.1.20/spec/supportutils.changes --- old/supportutils-3.1.19/spec/supportutils.changes 2022-01-10 23:35:34.819351618 +0100 +++ new/supportutils-3.1.20/spec/supportutils.changes 2022-03-04 19:06:15.809662744 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Mar 4 17:56:15 UTC 2022 - Jason Record <[email protected]> + +- Changes to version 3.1.20 + + Added command blkid #114 + + Added s390x specific files and output #115 + + Fix for invalid argument during updates (bsc#1193204) + + Optimized conf_files, conf_files_text and log_cmd functions #118 + + Fixed iscsi initiator name (bsc#1195797) + + Added rpcinfo -p output #116 + + Included /etc/sssd/conf.d configuration files #100 + +------------------------------------------------------------------- Mon Jan 10 22:35:23 UTC 2022 - Jason Record <[email protected]> - Changes to version 3.1.19 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1.19/spec/supportutils.spec new/supportutils-3.1.20/spec/supportutils.spec --- old/supportutils-3.1.19/spec/supportutils.spec 2021-12-15 14:30:40.678314658 +0100 +++ new/supportutils-3.1.20/spec/supportutils.spec 2022-03-04 19:06:17.773612495 +0100 @@ -19,7 +19,7 @@ %define support_libdir /usr/lib/supportconfig Name: supportutils -Version: 3.1.19 +Version: 3.1.20 Release: 0 Summary: Support Troubleshooting Tools License: GPL-2.0-only
