Hello community, here is the log from the commit of package supportutils for openSUSE:Factory checked in at 2019-03-05 12:17:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supportutils (Old) and /work/SRC/openSUSE:Factory/.supportutils.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supportutils" Tue Mar 5 12:17:06 2019 rev:11 rq:679589 version:3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/supportutils/supportutils.changes 2019-02-24 18:03:19.211776225 +0100 +++ /work/SRC/openSUSE:Factory/.supportutils.new.28833/supportutils.changes 2019-03-05 12:17:09.416991322 +0100 @@ -1,0 +2,12 @@ +Tue Feb 26 19:27:56 UTC 2019 - jason.rec...@suse.com + +- Fixed X missing /prob/fb error (bsc#1127069) +- Fixed dasdview -f (bsc#1109664) +- Clarified -t help description (bsc#1121043) +- Fixed grep error in NTP when /etc/cron.d is empty (bsc#1127063) +- Collects systemd journal with minimum install (bsc#1094225) +- Supportconfig fails on bzip archives (bsc#1120049) +- Get few drbd output & configuration #42 + Updated changes and supportconfig version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supportutils-3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/bin/supportconfig new/supportutils-3.1/bin/supportconfig --- old/supportutils-3.1/bin/supportconfig 2019-02-19 11:34:41.315290448 +0100 +++ new/supportutils-3.1/bin/supportconfig 2019-02-26 20:27:53.501552835 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -SVER='3.1-4.22' -SDATE='2019 02 16' +SVER='3.1-4.29' +SDATE='2019 02 26' ############################################################################## # supportconfig - Gathers system troubleshooting information for SUSE Support @@ -106,7 +106,8 @@ echo " -r <srnum>" echo " Includes the service request number when uploading the tar ball" echo " -s Include full SLP service lists" - echo " -t Target directory. Just save log files here, do not create tarball." + echo " -t <directory>" + echo " Target directory. Just save log files to <directory>, do not create a tarball." echo " -u Upload the tar ball to the specified VAR_OPTION_UPLOAD_TARGET." echo " -v Performs an rpm -V for each installed rpm NOTE: This takes a long time" echo " to complete" @@ -579,21 +580,34 @@ done else log_files $OF $VAR_OPTION_LINE_COUNT /var/log/warn - for LOGFILE in /var/log/localmessages /var/log/messages - do - if [ -e $LOGFILE ]; then - if [ $VAR_OPTION_MSG_MAXSIZE -eq 0 ]; then - log_files $OF 0 $LOGFILE # override and get the entire file + LOGFILE="/var/log/localmessages" + if [ -e $LOGFILE ]; then + if [ $VAR_OPTION_MSG_MAXSIZE -eq 0 ]; then + log_files $OF 0 $LOGFILE # override and get the entire file + else + MSGSIZE=$(stat -c%s $LOGFILE) + if [ $MSGSIZE -gt $VAR_OPTION_MSG_MAXSIZE ]; then + log_files $OF $VAR_OPTION_MSG_LINE_COUNT $LOGFILE # the file exceeded the max size allowed, get specified lines of the file else - MSGSIZE=$(stat -c%s $LOGFILE) - if [ $MSGSIZE -gt $VAR_OPTION_MSG_MAXSIZE ]; then - log_files $OF $VAR_OPTION_MSG_LINE_COUNT $LOGFILE # the file exceeded the max size allowed, get specified lines of the file - else - log_files $OF 0 $LOGFILE # get the whole file - fi + log_files $OF 0 $LOGFILE # get the whole file fi fi - done + fi + LOGFILE="/var/log/messages" + if [[ -e $LOGFILE ]]; then + if [[ $VAR_OPTION_MSG_MAXSIZE -eq 0 ]]; then + log_files $OF 0 $LOGFILE # override and get the entire file + else + MSGSIZE=$(stat -c%s $LOGFILE) + if [[ $MSGSIZE -gt $VAR_OPTION_MSG_MAXSIZE ]]; then + log_files $OF $VAR_OPTION_MSG_LINE_COUNT $LOGFILE # the file exceeded the max size allowed, get specified lines of the file + else + log_files $OF 0 $LOGFILE # get the whole file + fi + fi + else + log_cmd $OF "journalctl --no-pager --lines $VAR_OPTION_MSG_LINE_COUNT" + fi fi echolog Done } @@ -1862,8 +1876,8 @@ hd[a-z]|hd[a-z][a-z]) log_cmd $OF "parted -s /dev/$DISK unit s print" ;; xvd[a-z]|xvd[a-z][a-z]) log_cmd $OF "parted -s /dev/$DISK unit s print" ;; dasd[a-z]|dasd[a-z][a-z]) - log_cmd $OF "dasdview -i -f /dev/$DISK" - log_cmd $OF "dasdview -t info -f /dev/$DISK" + log_cmd $OF "dasdview -i /dev/$DISK" + log_cmd $OF "dasdview -t info /dev/$DISK" ;; cciss*) CCISS_DISK=$(echo $DISK | cut -d/ -f2) @@ -2222,7 +2236,7 @@ NTP_DAEMON=0 fi if [[ -d /etc/cron.d ]]; then - NTP_CRON=$(grep -i chronyd /etc/cron.d/* | cut -d\: -f1) + NTP_CRON=$(grep -i chronyd /etc/cron.d/* 2>/dev/null | cut -d\: -f1) if [[ -n $NTP_CRON ]]; then conf_files $OF $NTP_CRON NTP_CRON=$(basename $NTP_CRON) @@ -2941,6 +2955,10 @@ log_write $OF log_cmd $OF "lsmod | grep drbd" log_cmd $OF "modinfo drbd" + # Added By Ahmad Al Zayed - Feb 21, 2019 to get few drbd output & configuration + log_cmd $OF "drbdadm status" + log_cmd $OF "drbdadm dump" + log_cmd $OF "cat /proc/drbd" log_cmd $OF "ps aux | grep drbd | grep -v grep" [[ -x /usr/bin/findmnt ]] && log_cmd $OF "findmnt" || log_cmd $OF "mount" log_cmd $OF "df -h" @@ -2949,7 +2967,10 @@ FILES='' for DIR in $DIRLIST do - [ -d $DIR ] && FILES="$FILES $(find -L $DIR -type f)" + # We need to add "/etc/" since $DIR will have dir inside /etc/ + # However this find will find all files inside a specific folder It's okay + # Will end up with /etc/drbd.conf/nfs.res nfs.RES nfs.stop .... + [ -d "/etc/$DIR" ] && FILES="$FILES $(find -L "/etc/$DIR" -type f)" done conf_files $OF "/etc/drbd.conf $FILES" fi @@ -3381,7 +3402,7 @@ } x_info() { - local verify_list + local verify_list local xserver_present=n local drm_present=n @@ -3393,48 +3414,49 @@ 11*) for i in xorg-x11-Xvnc xorg-x11-libs xorg-x11 do - rpm -q $i &> /dev/null && rpm_verify $OF $i + rpm -q $i &> /dev/null && rpm_verify $OF $i done if rpm_verify $OF xorg-x11-server then - xserver_present=y - rpm_verify $OF Mesa - if rpm_verify $OF sax2 - then - log_cmd $OF 'sysp -q mouse' - log_cmd $OF 'sysp -c' - log_cmd $OF 'sysp -q keyboard' - log_files $OF $VAR_OPTION_LINE_COUNT /var/log/SaX.log - fi - log_cmd $OF 'bash -c "for i in /sys/class/input/input*; do echo -n \"\$i: \"; echo -n \$i/event* \" \" | sed -e \"s#\$i/##\"; cat \$i/name; done"' - log_cmd $OF 'ls -al /dev | egrep "video.*|mouse.*"' - log_cmd $OF '3Ddiag' - [ $SLES_VER -ge 113 ] && log_cmd $OF 'mokutil --sb-state' - log_cmd $OF 'cat /proc/fb' - grep -q "VESA" /proc/fb && log_cmd $OF 'hwinfo --framebuffer' - log_cmd $OF 'lspci -nn' + xserver_present=y + rpm_verify $OF Mesa + if rpm_verify $OF sax2 + then + log_cmd $OF 'sysp -q mouse' + log_cmd $OF 'sysp -c' + log_cmd $OF 'sysp -q keyboard' + log_files $OF $VAR_OPTION_LINE_COUNT /var/log/SaX.log + fi + log_cmd $OF 'bash -c "for i in /sys/class/input/input*; do echo -n \"\$i: \"; echo -n \$i/event* \" \" | sed -e \"s#\$i/##\"; cat \$i/name; done"' + log_cmd $OF 'ls -al /dev | egrep "video.*|mouse.*"' + log_cmd $OF '3Ddiag' + [ $SLES_VER -ge 113 ] && log_cmd $OF 'mokutil --sb-state' + if log_cmd $OF 'cat /proc/fb'; then + grep -q "VESA" /proc/fb && log_cmd $OF 'hwinfo --framebuffer' + fi + log_cmd $OF 'lspci -nn' - conf_files $OF /etc/sysconfig/displaymanager /etc/sysconfig/windowmanager /etc/xinetd.d/vnc - [ -e /etc/X11/xorg.conf ] && conf_files $OF /etc/X11/xorg.conf + conf_files $OF /etc/sysconfig/displaymanager /etc/sysconfig/windowmanager /etc/xinetd.d/vnc + [ -e /etc/X11/xorg.conf ] && conf_files $OF /etc/X11/xorg.conf - FILES="/var/log/Xorg.[0,1].log /var/log/Xorg.0.log.old /var/log/xdm.errors /root/.X.err /root/.xsession-errors" - test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES + FILES="/var/log/Xorg.[0,1].log /var/log/Xorg.0.log.old /var/log/xdm.errors /root/.X.err /root/.xsession-errors" + test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES fi if [ -d /sys/class/drm ] then - drm_present=y - if [ "$xserver_present" = "n" ] - then + drm_present=y + if [ "$xserver_present" = "n" ] + then [ $SLES_VER -ge 113 ] && log_cmd $OF 'mokutil --sb-state' log_cmd $OF 'lspci -nn' - fi - drm_sub_info + fi + drm_sub_info fi if [ "$xserver_present" = "y" -o "$drm_present" = "y" ] then - echolog Done + echolog Done else - echolog Skipped + echolog Skipped fi ;; 12*|15*) @@ -3500,49 +3522,50 @@ XORG_PACKAGES="$MESA $XORG_APPS $XORG_FONTS $XORG_LIBS $XORG_32_LIBS $XORG_DRIVERS $XORG_STUFF" for i in $XORG_PACKAGES xorg-x11-Xvnc tigervnc xorg-x11-server do - rpm -q $i &> /dev/null && verify_list="$verify_list $i" + rpm -q $i &> /dev/null && verify_list="$verify_list $i" done [ -n "$verify_list" ] && rpm_verify $OF "$verify_list" if rpm -q xorg-x11-server &>/dev/null then - xserver_present=y - log_cmd $OF 'bash -c "for i in /sys/class/input/input*; do echo -n \"\$i: \"; echo -n \$i/event* \" \" | sed -e \"s#\$i/##\"; cat \$i/name; done"' - log_cmd $OF 'ls -al /dev | egrep "video.*"' - [ $SLES_VER -ge 1130 ] && log_cmd $OF 'mokutil --sb-state' - log_cmd $OF 'cat /proc/fb' - grep -q "VESA" /proc/fb && log_cmd $OF 'hwinfo --framebuffer' - log_cmd $OF 'lspci -nn' - - conf_files $OF /etc/sysconfig/displaymanager /etc/sysconfig/windowmanager /etc/xinetd.d/vnc - if [ -e /etc/X11/xorg.conf ] - then + xserver_present=y + log_cmd $OF 'bash -c "for i in /sys/class/input/input*; do echo -n \"\$i: \"; echo -n \$i/event* \" \" | sed -e \"s#\$i/##\"; cat \$i/name; done"' + log_cmd $OF 'ls -al /dev | egrep "video.*"' + [ $SLES_VER -ge 1130 ] && log_cmd $OF 'mokutil --sb-state' + if log_cmd $OF 'cat /proc/fb'; then + grep -q "VESA" /proc/fb && log_cmd $OF 'hwinfo --framebuffer' + fi + log_cmd $OF 'lspci -nn' + + conf_files $OF /etc/sysconfig/displaymanager /etc/sysconfig/windowmanager /etc/xinetd.d/vnc + if [ -e /etc/X11/xorg.conf ] + then xorg_conf=/etc/X11/xorg.conf TMPLOG=$ADD_OPTION_LOGS - else [ -d /etc/X11/xorg.conf.d ] + else [ -d /etc/X11/xorg.conf.d ] xorg_conf='/etc/X11/xorg.conf.d/*' TMPLOG=0 - fi - [ -n "$xorg_conf" ] && ADD_OPTION_LOGS=$TMPLOG conf_files $OF $xorg_conf + fi + [ -n "$xorg_conf" ] && ADD_OPTION_LOGS=$TMPLOG conf_files $OF $xorg_conf - FILES="/var/log/Xorg.[0,1].log /var/log/Xorg.0.log.old /var/log/xdm.errors /root/.X.err /root/.xsession-errors" - test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES + FILES="/var/log/Xorg.[0,1].log /var/log/Xorg.0.log.old /var/log/xdm.errors /root/.X.err /root/.xsession-errors" + test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES fi if [[ -d /sys/class/drm ]] then - drm_present=y - if [ "$xserver_present" == "n" ] - then + drm_present=y + if [ "$xserver_present" == "n" ] + then log_cmd $OF 'mokutil --sb-state' log_cmd $OF 'lspci -nn' - fi - drm_sub_info + fi + drm_sub_info fi if [ "$xserver_present" = "y" -o "$drm_present" = "y" ] then - echolog Done + echolog Done else - echolog Skipped + echolog Skipped fi ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/bin/supportconfig.rc new/supportutils-3.1/bin/supportconfig.rc --- old/supportutils-3.1/bin/supportconfig.rc 2019-02-19 11:34:41.315290448 +0100 +++ new/supportutils-3.1/bin/supportconfig.rc 2019-02-26 19:13:24.902005647 +0100 @@ -113,8 +113,8 @@ FSLIST_ADD_FILE="${LIB_DIR}/additional-files.list" BASIC_ENVF=basic-environment.txt XML_FILE=summary.xml -COMPRESS="tbz" -COMPRESS_OPT="jcf" +COMPRESS="txz" +COMPRESS_OPT="Jcf" SC_SRV=$(hostname) # %s test "$SC_SRV" = "" && SC_SRV=suse SC_DATE=$(date +"%y%m%d") # %d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/spec/supportutils.changes new/supportutils-3.1/spec/supportutils.changes --- old/supportutils-3.1/spec/supportutils.changes 2019-02-19 11:34:41.335289881 +0100 +++ new/supportutils-3.1/spec/supportutils.changes 2019-02-26 20:28:33.520446713 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Feb 26 19:27:56 UTC 2019 - jason.rec...@suse.com + +- Fixed X missing /prob/fb error (bsc#1127069) +- Fixed dasdview -f (bsc#1109664) +- Clarified -t help description (bsc#1121043) +- Fixed grep error in NTP when /etc/cron.d is empty (bsc#1127063) +- Collects systemd journal with minimum install (bsc#1094225) +- Supportconfig fails on bzip archives (bsc#1120049) +- Get few drbd output & configuration #42 + Updated changes and supportconfig version + +------------------------------------------------------------------- Mon Feb 18 10:30:00 UTC 2019 - jason.rec...@suse.com - Corrected missed SUSE separation lines