Hello community, here is the log from the commit of package supportutils checked in at Tue Oct 14 19:24:55 CEST 2008. -------- --- supportutils/supportutils.changes 2008-10-13 17:52:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/supportutils/supportutils.changes 2008-10-14 00:49:01.554167000 +0200 @@ -2 +2 @@ -Mon Oct 13 09:46:47 MDT 2008 - jrecord@novell.com +Mon Oct 13 16:33:41 MDT 2008 - jrecord@novell.com @@ -4 +4,4 @@ --added uuidgen to tar ball filename to ensure uniqueness +-fixed repeat directory name selection +-fixed including compressed log files (bnc#434896) +-added -q enables the unique id string +-added uuidgen or date +%s%N to tarball for uniqueness calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supportutils.spec ++++++ --- /var/tmp/diff_new_pack.h13825/_old 2008-10-14 19:24:25.000000000 +0200 +++ /var/tmp/diff_new_pack.h13825/_new 2008-10-14 19:24:25.000000000 +0200 @@ -25,7 +25,7 @@ Group: System/Management AutoReqProv: on Version: 1.01 -Release: 8 +Release: 9 Source: %{name}-%{version}.tar.gz Summary: Support Troubleshooting Tools BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -86,7 +86,10 @@ %changelog * Mon Oct 13 2008 jrecord@novell.com --added uuidgen to tar ball filename to ensure uniqueness +-fixed repeat directory name selection +-fixed including compressed log files (bnc#434896) +-added -q enables the unique id string +-added uuidgen or date +%%s%N to tarball for uniqueness -added -n for secure Novell tar ball uploads * Fri Oct 10 2008 jrecord@novell.com -added dmesg output in boot.txt ++++++ supportutils-1.01.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig new/supportutils-1.01/supportconfig --- old/supportutils-1.01/supportconfig 2008-10-13 17:48:35.000000000 +0200 +++ new/supportutils-1.01/supportconfig 2008-10-14 00:34:07.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -SVER=2.25-30 +SVER=2.25-34 SDATE="2008 10 13" ############################################################################## @@ -112,6 +112,7 @@ VAR_OPTION_PENGINE_FILES_LIMIT=250 # -H VAR_OPTION_SAR_FILES_LIMIT=30 # -S VAR_OPTION_SILENT=0 # -Q +VAR_OPTION_UNIQUE_FILE=0 # -q VAR_OPTION_UPLOAD_TARGET="ftp://ftp.novell.com/incoming" # -U PATH="/sbin:/usr/sbin:/bin:/usr/bin:$PATH" @@ -133,9 +134,11 @@ SC_SRV=$(hostname) test "$SC_SRV" = "" && SC_SRV=novell SC_TIME=$(date +"%y%m%d_%H%M") -test -x /usr/bin/uuidgen && BASE="nts_${SC_SRV}_${SC_TIME}_$(uuidgen 2>/dev/null)" || BASE="nts_${SC_SRV}_${SC_TIME}" +BASE="nts_${SC_SRV}_${SC_TIME}" ARCH=$(uname -i) XPLUGIN_DIR=/opt/supportconfig/plugins +SAVE_LOGS_ONLY=0 +USE_SAVED_LOGS_ONLY=0 # These are minimum options and should never be unset. MIN_OPTION_RPM=1 @@ -207,6 +210,7 @@ echo " rpm, messages, y2logs" echo " -n Upload the tarball through a secure channel to Novell" echo " -p Disable all plugins" + echo " -q Add a uuid to the tar ball filename to ensure uniqueness" echo " -r <srnum>" echo " Includes the Novell $SRLEN digit service request number when uploading" echo " the tar ball to Novell" @@ -295,6 +299,10 @@ shift for CONF in $@ do + BAD_FILE=$(echo $CONF | egrep "tbz$|bz2$|gz$|zip$") + if [ -n "$BAD_FILE" ]; then + continue + fi echo "#==[ Log File ]=====================================#" >> $LOGFILE if [ -f $CONF ]; then if [ $LOGLINES -eq 0 ]; then @@ -975,7 +983,7 @@ timed_log_cmd $OF 'zypper -n pch' fi conf_files $OF /etc/zypp/zypp.conf - FILES=$(find /var/log/ -type f | grep zypp | egrep -v "bz2$|gz$|zip$|tgz$") + FILES=$(find /var/log/ -type f | grep zypp) if [ $ADD_OPTION_LOGS -eq 1 ]; then log_files $OF 0 $FILES else @@ -2409,7 +2417,7 @@ fi if [ -d /var/log/samba ]; then - FILES=$(find /var/log/samba -type f | egrep -v "bz2$|gz$|zip$|tgz$") + FILES=$(find /var/log/samba -type f) test $ADD_OPTION_LOGS -eq 1 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES fi @@ -2931,20 +2939,12 @@ } check_log_dir() { - SUBBASE=1 - MAX_SUBBASE=5 + # if supportconfig repeats execution too fast, make sure the directory is unique so files are not overwritten ORIGBASE=$BASE while [ -d $LOG ] do - BASE=${ORIGBASE}_${SUBBASE} + test -x /usr/bin/uuidgen && BASE="${ORIGBASE}_$(uuidgen 2>/dev/null)" || BASE="${ORIGBASE}_$(date +%s%N)" LOG=/var/log/$BASE - if [ $SUBBASE -gt $MAX_SUBBASE ]; then - echo "ERROR: Log directory repeat attempt exceeds threshold: $MAX_SUBBASE" - echo " Please wait and try again in 1 minute." - echo - exit 2 - fi - ((SUBBASE++)) done } @@ -3117,7 +3117,7 @@ fi init_plugins on ALL_ARGS="$@" -while getopts :ACDFG:LQT:O:E:M:N:P:I:S:X:H:R:U:W:deghi:klmnpr:suvx:yt:f: TMPOPT +while getopts :ACDFG:LQT:O:E:M:N:P:I:S:X:H:R:U:W:deghi:klmnpqr:suvx:yt:f: TMPOPT do case $TMPOPT in \:) clear; title @@ -3161,7 +3161,8 @@ l) ADD_OPTION_LOGS=1 ;; p) init_plugins off ;; m) set_to_min ;; - n) VAR_OPTION_UPLOAD_TARGET="https://secure-www.novell.com/upload?appname=supportconfig"; NOVELL_SECURE_UPLOAD=1; UPLOAD_TARBALL=1 ;; + n) VAR_OPTION_UPLOAD_TARGET="https://secure-www.novell.com/upload?appname=supportconfig"; NOVELL_SECURE_UPLOAD=1; UPLOAD_TARBALL=1; VAR_OPTION_UNIQUE_FILE=1 ;; + q) VAR_OPTION_UNIQUE_FILE=1 ;; r) CONTACT_SRNUM=$OPTARG; if valid_srnum; then BASE="nts_SR${CONTACT_SRNUM}_${SC_SRV}_${SC_TIME}" @@ -3192,6 +3193,10 @@ VAR_OPTION_LOG_DIRS=$TARGET_DIRECTORY fi +if (( VAR_OPTION_UNIQUE_FILE )); then + test -x /usr/bin/uuidgen && BASE="${BASE}_$(uuidgen 2>/dev/null)" || BASE="${BASE}_$(date +%s%N)" +fi + if [ -n "$FROM_DIRECTORY" ]; then VAR_OPTION_LOG_DIRS=$FROM_DIRECTORY BASE=$(ls -t $FROM_DIRECTORY | grep nts | head -n1) @@ -3200,7 +3205,7 @@ for LOG in $VAR_OPTION_LOG_DIRS do LOG=${LOG}/${BASE} - [ "$USE_SAVED_LOGS_ONLY"=="1" ] || check_log_dir + [ $USE_SAVED_LOGS_ONLY -eq 0 ] && check_log_dir if mkdir -p $LOG &>/dev/null; then unset LOGERROR break @@ -3209,6 +3214,7 @@ LOGERROR=1 fi done + test $LOGERROR && { echo; exit 3; } PREFERRED_LOG_DIR=/var/log CURRENT_LOG_DIR=$(dirname $LOG) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.1 new/supportutils-1.01/supportconfig.1 --- old/supportutils-1.01/supportconfig.1 2008-10-13 17:48:35.000000000 +0200 +++ new/supportutils-1.01/supportconfig.1 2008-10-14 00:34:07.000000000 +0200 @@ -2,7 +2,7 @@ .SH NAME supportconfig - Gathers system troubleshooting information .SH SYNOPSIS -supportconfig [\fB\-ACDFLQdeghklmnpsuvy\fR][\fB-E\fR string][\fB-G\fR gpg_uid][\fB-H\fR number][\fB-I\fR number][\fB-M\fR string][\fB-N\fR string][\fB-O\fR string][\fB-P\fR string][\fB-R\fR directory path][\fB-S\fR number][\fB-T\fR seconds][\fB-U\fR URI string][\fB-W\fR string][\fB-X\fR number][\fB-f\fR directory][\fB-i\fR keyword list][\fB-r\fR srnum][\fB-t\fR directory][\fB-x\fR keyword list] +supportconfig [\fB\-ACDFLQdeghklmnpqsuvy\fR][\fB-E\fR string][\fB-G\fR gpg_uid][\fB-H\fR number][\fB-I\fR number][\fB-M\fR string][\fB-N\fR string][\fB-O\fR string][\fB-P\fR string][\fB-R\fR directory path][\fB-S\fR number][\fB-T\fR seconds][\fB-U\fR URI string][\fB-W\fR string][\fB-X\fR number][\fB-f\fR directory][\fB-i\fR keyword list][\fB-r\fR srnum][\fB-t\fR directory][\fB-x\fR keyword list] .SH DESCRIPTION Creates a tar ball that can be attached to a Novell service request and/or sent to a Novell Technical Services engineer. Basic info is collected for SLES8. More comprehensive information is collected for SLES9, SLE10 and OES Linux. .PP @@ -146,6 +146,9 @@ \fB\-p\fR Disable all plugin execution .TP +\fB\-q\fR +Add a unique identifier to the supportconfig tar ball filename. You usually do not need this, as hostnames, date and times are unique enough within an organization. However, when uploading to Novell or some other central public repository, it is needed. +.TP \fB\-r\fR \fIsrnum\fR Includes the Novell 11 digit service request number in the basic-environment.txt file and the tar ball filename. Use this option when uploading (-u) tar balls to Novell. .TP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.conf new/supportutils-1.01/supportconfig.conf --- old/supportutils-1.01/supportconfig.conf 2008-10-13 17:48:35.000000000 +0200 +++ new/supportutils-1.01/supportconfig.conf 2008-10-14 00:34:07.000000000 +0200 @@ -71,5 +71,6 @@ VAR_OPTION_PENGINE_FILES_LIMIT=250 # -H VAR_OPTION_SAR_FILES_LIMIT=30 # -S VAR_OPTION_SILENT=0 # -Q +VAR_OPTION_UNIQUE_FILE=0 # -q VAR_OPTION_UPLOAD_TARGET="ftp://ftp.novell.com/incoming" # -U diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig.conf.5 new/supportutils-1.01/supportconfig.conf.5 --- old/supportutils-1.01/supportconfig.conf.5 2008-10-13 17:48:35.000000000 +0200 +++ new/supportutils-1.01/supportconfig.conf.5 2008-10-14 00:34:07.000000000 +0200 @@ -1,4 +1,4 @@ -.TH supportconfig.conf "5" "10 Oct 2008" "supportconfig.conf" "Support Utilities Manual" +.TH supportconfig.conf "5" "13 Oct 2008" "supportconfig.conf" "Support Utilities Manual" .SH NAME supportconfig.conf \- .BR supportconfig (1) @@ -226,6 +226,9 @@ VAR_OPTION_SILENT When set to 1, supportconfig runs in quiet mode. This option is useful if you plan on running regular supportconfigs in a cron job for example. \fB\-Q\fR (0) .TP +VAR_OPTION_UNIQUE_FILE +When set to 1, supportconfig adds a unique identifier string to the tar ball filename. This option is usually not needed, but is useful for public upload sites, like Novell or service providers. \fB\-q\fR (0) +.TP VAR_OPTION_UPLOAD_TARGET Used to specify where the supportconfig tar ball will be uploaded, when using the \fB\-u\fR startup option. The default is Novell's public ftp server. You should use the \fB\-r\fR \fIsrnum\fR to specify the Novell service request number for all tar balls uploaded to Novell. \fB\-U\fR (ftp://ftp.novell.com/incoming) .PD diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.changes new/supportutils-1.01/supportutils.changes --- old/supportutils-1.01/supportutils.changes 2008-10-13 17:48:35.000000000 +0200 +++ new/supportutils-1.01/supportutils.changes 2008-10-14 00:34:07.000000000 +0200 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- -Mon Oct 13 09:46:47 MDT 2008 - jrecord@novell.com +Mon Oct 13 16:33:41 MDT 2008 - jrecord@novell.com --added uuidgen to tar ball filename to ensure uniqueness +-fixed repeat directory name selection +-fixed including compressed log files (bnc#434896) +-added -q enables the unique id string +-added uuidgen or date +%s%N to tarball for uniqueness -added -n for secure Novell tar ball uploads ------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.spec new/supportutils-1.01/supportutils.spec --- old/supportutils-1.01/supportutils.spec 2008-10-13 17:48:35.000000000 +0200 +++ new/supportutils-1.01/supportutils.spec 2008-10-14 00:34:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package supportutils (Version 1.01.13) +# spec file for package supportutils (Version 1.01.14) # # Copyright (C) 2008 Novell, Inc. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: System/Management Autoreqprov: on Version: 1.01 -Release: 13 +Release: 14 Source: %{name}-%{version}.tar.gz Summary: Support Troubleshooting Tools BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org