commit s390-tools

27 Oct 2008

Hello community,

here is the log from the commit of package s390-tools
checked in at Mon Oct 27 17:13:03 CET 2008.


--------

--- arch/s390/s390-tools/s390-tools.changes	2008-10-22 10:29:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/s390-tools/s390-tools.changes	2008-10-27 14:28:47.644104000 +0100
@@ -1,0 +2,11 @@
+Mon Oct 27 14:04:32 CET 2008 - hare@suse.de
+
+- Update 59-dasd.rules (bnc#436980)
+- Use udevadm instead of udevsettle (bnc#437349)
+
+-------------------------------------------------------------------
+Mon Oct 27 13:34:40 CET 2008 - jjolly@suse.de
+
+- Updated to 1.8.0 v6 tarball from IBM (bnc#417514)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  s390-tools-1.8.0-v5.tar.bz2

New:
----
  59-dasd.rules
  s390-tools-1.8.0-v6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ s390-tools.spec ++++++
--- /var/tmp/diff_new_pack.W24042/_old	2008-10-27 17:12:46.000000000 +0100
+++ /var/tmp/diff_new_pack.W24042/_new	2008-10-27 17:12:46.000000000 +0100
@@ -22,12 +22,12 @@
 Url:            http://www10.software.ibm.com/developerworks/opensource/linux390
 Summary:        S/390 tools like zipl and dasdfmt
 Version:        1.8.0
-Release:        10
+Release:        11
 PreReq:         %insserv_prereq %fillup_prereq
 License:        GPL v2 or later
 Provides:       s390utils:/sbin/dasdfmt
 Group:          System/Kernel
-Source:         s390-tools-%{version}-v5.tar.bz2
+Source:         s390-tools-%{version}-v6.tar.bz2
 AutoReqProv:    yes
 Source1:        s390-tools-rpmlintrc
 Source2:        zipl.conf
@@ -57,6 +57,7 @@
 Source55:       blktrace_api.h
 Source56:       boot.cpi
 Source57:       sysconfig.cpi
+Source100:      59-dasd.rules
 Patch0:         s390tools-150.patch
 Patch1:         s390tools-160-pardasdfmt.patch
 Patch2:         s390tools-160-osasnmpd_makefile.patch
@@ -137,6 +138,7 @@
 install -D -m644 zfcpdump_v2/zfcpdump $RPM_BUILD_ROOT%{_datadir}/s390-tools
 install -D -m644 etc/sysconfig/dumpconf $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dumpconf
 install -D -m755 etc/init.d/dumpconf $RPM_BUILD_ROOT/etc/init.d/dumpconf
+install -D -m644 %{S:100} $RPM_BUILD_ROOT/etc/udev/rules.d/59-dasd.rules
 #install -D -m644 etc/udev/rules.d/59-dasd.rules $RPM_BUILD_ROOT/etc/udev/rules.d/59-dasd.rules
 install -D -m644 etc/udev/rules.d/57-osasnmpd.rules $RPM_BUILD_ROOT/etc/udev/rules.d/57-osasnmpd.rules
 install -D -m644 etc/sysconfig/mon_statd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mon_statd
@@ -255,6 +257,11 @@
 /usr/lib/%{snmp}/agents/osasnmpd
 
 %changelog
+* Mon Oct 27 2008 hare@suse.de
+- Update 59-dasd.rules (bnc#436980)
+- Use udevadm instead of udevsettle (bnc#437349)
+* Mon Oct 27 2008 jjolly@suse.de
+- Updated to 1.8.0 v6 tarball from IBM (bnc#417514)
 * Wed Oct 22 2008 hare@suse.de
 - Update zfcp_san_disc to work with automatic port discovery
   (bnc#433863)
@@ -387,7 +394,7 @@
   (#159552 - LTC22536)
 * Thu May 18 2006 hare@suse.de
 - mkdump.sh: fix check_devsize (#165818)
-* Wed May 10 2006 ihno@suse.de
+* Tue May 09 2006 ihno@suse.de
 - fixed activation of XPRAM devices. (#161352)
 * Fri Apr 28 2006 hare@suse.de
 - mkdump.sh: use sfdisk instead of parted;
@@ -395,7 +402,7 @@
 * Fri Apr 21 2006 hare@suse.de
 - dasd_configure: Remove hwcfg file on deconfiguring device even
   if no ccw device exists.
-* Thu Apr 20 2006 ihno@suse.de
+* Wed Apr 19 2006 ihno@suse.de
 - create mountpoint, if it does not exist (#157108)
 - force the creation of swap/filesystem (#161363)
 * Thu Apr 13 2006 uli@suse.de

++++++ 59-dasd.rules ++++++
#
# Rules for unique DASD device nodes created in /dev/disk/
# This file should be installed in /etc/udev/rules.d
#

SUBSYSTEM!="block", GOTO="dasd_symlinks_end"

ACTION!="change", GOTO="dasd_block_end"
# by-id (hardware serial number)
KERNEL=="dasd*[!0-9]", ATTRS{status}=="online", IMPORT{program}="/sbin/dasdinfo -a -e -b $kernel"
KERNEL=="dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
KERNEL=="dasd*[!0-9]", ENV{ID_UID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_UID}"
KERNEL=="dasd*[!0-9]", ENV{ID_XUID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_XUID}"

LABEL="dasd_block_end"

ACTION!="add", GOTO="dasd_partition_end"
# for partitions import parent information
KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"

KERNEL=="dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
KERNEL=="dasd*[0-9]", ENV{ID_UID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_UID}-part%n"
KERNEL=="dasd*[0-9]", ENV{ID_XUID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_XUID}-part%n"

LABEL="dasd_partition_end"

ENV{ID_SERIAL}!="?*", GOTO="dasd_symlinks_end"
# by-label/by-uuid (filesystem properties)
IMPORT{program}="/sbin/vol_id --export $tempnode"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"

LABEL="dasd_symlinks_end"
++++++ dasd_configure ++++++
--- /var/tmp/diff_new_pack.W24042/_old	2008-10-27 17:12:46.000000000 +0100
+++ /var/tmp/diff_new_pack.W24042/_new	2008-10-27 17:12:46.000000000 +0100
@@ -127,7 +127,7 @@
     # Unconditionally load the cpint module, loader might be broken
     [ -x /sbin/modprobe ] && /sbin/modprobe -q vmcp
     # Wait until udev is settled
-    [ -x /sbin/udevsettle ] && /sbin/udevsettle --timeout=30
+    [ -x /sbin/udevadm ] && /sbin/udevadm settle --timeout=30
 
     # Check read-only status of virtual DASDs from z/VM
     if /sbin/vmcp q v dasd > /dasd_attr.lst 2> /dev/null; then

++++++ s390-tools-1.8.0-v5.tar.bz2 -> s390-tools-1.8.0-v6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/zconf/lszfcp new/s390-tools-1.8.0/zconf/lszfcp
--- old/s390-tools-1.8.0/zconf/lszfcp	2008-03-26 14:23:21.000000000 +0100
+++ new/s390-tools-1.8.0/zconf/lszfcp	2008-10-21 08:44:26.000000000 +0200
@@ -43,7 +43,11 @@
 
 check_fcp_devs()
 {
-	ignore=`ls $SYSFS/devices/css0/*/*/host* 2>&1`
+	if $FC_CLASS; then
+		ignore=`ls $SYSFS/class/fc_host/host* 2>&1`
+	else
+		ignore=`ls $SYSFS/devices/css0/[0-9]*/[0-9]*/host* 2>&1`
+	fi
 
 	if [ $? -ne 0 ]; then
 		echo "Error: No fcp devices found."
@@ -127,7 +131,7 @@
 
 show_hosts()
 {
-	HOST_LIST=`ls -dX $SYSFS/devices/css0/*/*/host*`
+	HOST_LIST=`ls -dX $SYSFS/devices/css0/[0-9]*/[0-9]*/host*`
 
 	for HOST_PATH in $HOST_LIST; do
 		SCSI_HOST=`basename $HOST_PATH`
@@ -222,7 +226,7 @@
 	if $FC_CLASS; then
 		SCSI_DEVICE_LIST=`ls -d \
 			$SYSFS/devices/css0/*/*/host*/rport*/target*/*/ |\
-		       	grep -v fc_transport`
+		       	grep -P '\d+:\d+:\d+:\d+'`
 	else
 		SCSI_DEVICE_LIST=`ls -d $SYSFS/devices/css0/*/*/host*/*/`
 	fi
@@ -305,8 +309,8 @@
 
 check_sysfs
 check_zfcp_support
-check_fcp_devs
 check_fc_class
+check_fcp_devs
 
 default=1
 if [ $SHOW_HOSTS -eq 1 ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon new/s390-tools-1.8.0/ziomon/ziomon
--- old/s390-tools-1.8.0/ziomon/ziomon	2008-10-10 10:23:29.000000000 +0200
+++ new/s390-tools-1.8.0/ziomon/ziomon	2008-10-16 10:36:31.000000000 +0200
@@ -251,7 +251,7 @@
    # we do this synchronously, as some of the volumes affected by this action
    # might be the ones to monitor
    echo -n "Collecting configuration data...";
-   command="ziomon_fcpconf $verbose $WRP_LOGFILE";
+   command="ziomon_fcpconf -o $WRP_LOGFILE";
    debug "collect system data: $command";
    $command > $WRP_MSG_Q_PATH/ziomon_fcpconf.log;
    echo "done";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon.8 new/s390-tools-1.8.0/ziomon/ziomon.8
--- old/s390-tools-1.8.0/ziomon/ziomon.8	2008-10-02 12:39:30.000000000 +0200
+++ new/s390-tools-1.8.0/ziomon/ziomon.8	2008-10-22 19:06:49.000000000 +0200
@@ -57,6 +57,10 @@
 interval length.
 
 .TP
+.BR "\-o" " or " "\-\-outfile"
+Basename for output files.
+
+.TP
 .BR device
 specifies a device to collect respective data for.
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon_fcpconf new/s390-tools-1.8.0/ziomon/ziomon_fcpconf
--- old/s390-tools-1.8.0/ziomon/ziomon_fcpconf	2008-08-14 13:41:05.000000000 +0200
+++ new/s390-tools-1.8.0/ziomon/ziomon_fcpconf	2008-10-16 10:36:31.000000000 +0200
@@ -1,466 +1,63 @@
-#!/bin/bash 
-
+#!/usr/bin/perl
 ###############################################################################
-# collect some configuration, trace, and debug
-# information about the S390 Linux system
+# Script to collect all system information required for analysis
 #
-# Copyright IBM Corp. 2002, 2008.
-###############################################################################
-
-
-# variables
+# Copyright IBM Corp. 2008.
 #
-
-SCRIPTNAME="ziomon_fcpconf.sh"
-WORKDIR=ziomon_fcpconf
-rc_check_zvm=0
-# write output to following directory
-WORKPFX=/tmp
-WORKPATH=$WORKPFX/$WORKDIR
-# write output to following files
-CMDOUTPUT=runtime.out
-VM_CMDOUTPUT=zvm_runtime.out
-SYSFSFILELIST=sysfsfiles.out
-MOUNT_POINT_DEBUGFS="/sys/kernel/debug"
-kernel_version_tmp=0
-OUTFILENAME="";
-DEBUG=0;
-
-LOGFILE=dbginfo.log
-
-pwd=$PWD;
-
-# procfs entries to be collected (except s390dbf and scsi)
-PROCFILES=" \
-    /proc/sysinfo \
-    /proc/version \
-    /proc/cpuinfo \
-    /proc/meminfo \
-    /proc/buddyinfo \
-    /proc/slabinfo \
-    /proc/modules \
-    /proc/mounts \
-    /proc/partitions \
-    /proc/stat \
-    /proc/devices \
-    /proc/misc \
-    /proc/qeth \
-    /proc/qeth_perf \
-    /proc/qeth_ipa_takeover \
-    /proc/cmdline \
-    /proc/crypto \
-    /proc/diskstats \
-    /proc/dasd/devices \
-    /proc/dasd/statistics \
-    /proc/sys/vm/cmm_pages \
-    /proc/sys/vm/cmm_timed_pages \
-    /proc/sys/vm/cmm_timeout \
-    "
-PROCFILES_24=" \
-    /proc/subchannels \
-    /proc/chpids \
-    /proc/chandev \
-    /proc/ksyms \
-    /proc/lvm/global \
-    "
-
-# log files to be collected
-LOGFILES=" \
-    /var/log/messages \
-    /var/log/IBMtape.trace \
-    /var/log/IBMtape.errorlog
-    /var/log/lin_tape.trace
-    /var/log/lin_tape.errorlog
-    "
-# config files to be collected;
-# additional all files "modules.dep" are collected
-CONFIGFILES=" \
-    /etc/ccwgroup.conf \
-    /etc/chandev.conf \
-    /etc/modules.conf \
-    /etc/modprobe.conf
-    /etc/fstab \
-    /etc/syslog.conf \
-    /etc/sysconfig \
-    /etc/crontab \
-    /etc/exports \
-    /etc/sysctl.conf \
-    /etc/zipl.conf \
-    /etc/lvm \
-    /etc/IBMtaped.conf \
-    /etc/lin_taped.conf \
-    /etc/multipath.conf \
-    /etc/zfcp.conf \
-    "
-
-# collect output of following commands;
-# commands are separated by ':'
-CMDS="uname -a\
-    :ps aux\
-    :ps axX\
-    :dmesg -s 1048576\
-    :route -n\
-    :dmsetup ls\
-    :dmsetup table\
-    :dmsetup status\
-    :multipath -v6 -ll\
-    :lscss\
-    :lsdasd\
-    :lsmod\
-    :lsdev\
-    :lsscsi\
-    :lstape\
-    :lszfcp\
-    :SPident\
-    :sysctl -a\
-    :mount\
-    :df -h\
-    :pvpath -qa
-    "
-
-#
-# function definitions
-#
-
-
-function debug() {
-   if [ $DEBUG -ne 0 ]; then
-      echo "    === $@";
-   fi
-}
-
-
-# print version info
-printversion()
-{
-    cat <<EOF
-$SCRIPTNAME: Configuration data collector, version %S390_TOOLS_VERSION%
-Copyright IBM Corp. 2002, 2008.
-EOF
-}
-
-# print usage and help
-printhelp()
-{
-    cat <<EOF
-Usage: $SCRIPTNAME [-h] [-v] [-V] OUTFILE
-
-Collect fcp-related configuration information.
-OUTFILE is the basename for the output file.
-
--h, --help              Print usage information and exit.
--v, --version           Print version information and exit.
--V, --verbose           Be verbose
-EOF
-}
-
-# copy file $1 to $WORKPATH
-collect_file_contents()
-{
-    echo "  $1" >>  $LOGFILE
-    if [ ! -e $1 ]
-    then
-	echo "  WARNING: No such file: \"$1\"" >> $LOGFILE
-	return 1
-    elif [ ! -r $1 ]
-    then
-	echo "  WARNING: Permission denied: \"$1\"" >> $LOGFILE
-	return 1
-    else
-	if [ ! -e $WORKPATH`dirname $1` ]
-	then
-	    mkdir --parents $WORKPATH`dirname $1`
-	fi
-	cp -r -d -L --parents $1 $WORKPATH 2>> $LOGFILE
-# 	head -c 10m $1 >> $2
-	if [ $? -ne 0 ]
-	then
-	    echo "  WARNING: cp failed for file: \"$1\"" >> $LOGFILE
-	    return 1
-	else
-	    return 0
-	fi
-    fi
-}
-
-# append output of command $1 to file $2
-collect_cmd_output()
-{
-    echo "#######################################################">>$2
-    echo "$USER@$HOST> $1">>$2
-    $1 1>>$2 2>&1
-    echo "" >>$2
-    if [ $? -ne 0 ]
-    then
-	echo "  WARNING: Command not successfully completed: \"$1\"">>  $2
-	return 1
-    else
-	return 0
-    fi
-    
-}
-
-# check cmd line arguments
-check_cmdline()
-{
-    while [ $# -ne 0 ]; do
-        case $1 in
-            --help|-h)
-                printhelp;
-                exit 1;;
-            --version|-v)
-                printversion;
-                exit 1;;
-            --verbose|-V)
-                DEBUG=1;;
-            -*)
-                echo "$SCRIPTNAME: Invalid option -- $1";
-                echo "Try '$SCRIPTNAME --help' for more information.";
-                exit 1;;
-            *)
-               OUTFILENAME=$1;
-        esac;
-        shift;
-    done
-}
-
-# change into temporary directory; if necessary create the directory
-prepare_workdir()
-{
-    if [ ! -e $WORKPFX ]
-    then
-    	mkdir $WORKPFX
-    fi
-	    	
-    if [ -e $WORKPATH ]
-    then
-	# remove old stuff
-	debug "Clean up target directory $WORKPATH"
-	rm -rf $WORKPATH/*
-    else
-	debug "Create target directory $WORKPATH"
-	mkdir $WORKPATH
-    fi
-    debug "Change to target directory $WORKPATH"
-    cd $WORKPATH
-}
-
-# collect single proc fs entries
-# (PRCFILES should not contain /proc/scsi and /proc/s390dbf)
-collect_procfs()
-{
-    debug "Get procfs entries"
-    echo "Get procfs entries" > $LOGFILE
-    for i in $*
-    do
-	collect_file_contents $i
-    done
-}
-
-# collect procfs entries of /proc/s390dbf
-collect_s390dbf()
-{
-    debug "Get entries of /proc/s390dbf";
-    echo "Get entries of /proc/s390dbf" > $LOGFILE
-    if [ -e /proc/s390dbf ]
-    then
-	for i in `find /proc/s390dbf -type f \
-                  -not -path "*/raw" -not -path "*/flush"`
-	do
-	    collect_file_contents $i
- 	done
-    else
-	echo "  WARNING: /proc/s390dbf not found" | tee -a $LOGFILE
-    fi
-}
-
-# collect procfs entries of /proc/scsi
-collect_procfs_scsi()
-{
-    debug "Get entries of /proc/scsi";
-    echo "Get entries of /proc/scsi" > $LOGFILE
-    if [ -e /proc/scsi ]
-    then
-	for i in `find /proc/scsi -type f \
-                  -perm +0444`
-	do
-	    collect_file_contents $i
-	done
-    else
-	echo "  WARNING: /proc/scsi not found" >> $LOGFILE
-    fi
-}
-
-# collect sysfs entries
-collect_sysfs()
-{
-    local rc_mount=""
-    # check if debugfs is mounted
-    mount | grep -q $MOUNT_POINT_DEBUGFS
-    rc_mount=$?
-    if [ $rc_mount -eq 1 ] && [ $kernel_version_tmp -ge 13 ]; then
-	mount -t debugfs debugfs $MOUNT_POINT_DEBUGFS
-    fi
-
-    debug "Get file list of /sys";
-    echo "Get file list of /sys" > $LOGFILE
-	collect_cmd_output "ls -Rl /sys" $SYSFSFILELIST
-    
-    debug "Get entries of /sys";
-    echo "Get entries of /sys" > $LOGFILE
-    for i in `find /sys -noleaf -type f -perm +444`
-    	do
-    		if [ -e $i ]
-    		then
-	    		collect_file_contents $i
-		else
-			echo "  WARNING: $i not found" | tee -a $LOGFILE
-    		fi
-	done
-    #unmount debugfs if not mounted at the beginning
-    if [ $rc_mount -eq 1 ] && [ $kernel_version_tmp -ge 13 ]; then
-	umount $MOUNT_POINT_DEBUGFS
-    fi
-
-}
-
-# collect output of commands
-collect_cmdsout()
-{
-    local commands=$1
-    local outputfile=$2
-    if [ $rc_check_zvm -eq 1 ]; then
-        debug "Saving z/VM runtime information into $outputfile";
-    	echo "Saving z/VM runtime information into $outputfile" > $LOGFILE
-    else
-        debug "Saving runtime information into $outputfile";
-    	echo "Saving runtime information into $outputfile" > $LOGFILE
-    fi
-    _IFS_ORIG=$IFS
-    IFS=:
-    for i in $commands
-    do
-	IFS=$_IFS_ORIG
-	if [ $rc_check_zvm -eq 1 ]; then 
-		i="$cp_tool $i"
-	fi
-	collect_cmd_output "$i" "$outputfile"
-	IFS=:
-    done
-    IFS=$_IFS_ORIG
-}
-
-# config files and module dependencies
-collect_config()
-{
-    debug "Copy config files";
-    echo "Copy config files" > $LOGFILE
-    for i in $CONFIGFILES
-    do
-	collect_file_contents $i
-    done
-}
-
-# Check if we run under z/VM and which Linux cp tool is installed
-check_zvm()
-{
-    cp_tool=''
-    debug "Check if we run under z/VM";
-    echo "Check if we run under z/VM" > $LOGFILE
-    # Are we running under z/VM 
-    cat /proc/sysinfo | grep -q "z/VM"
-    if [ $? -eq 1 ] 
-    then
-        debug " Running in LPAR"
-	echo " Running in LPAR" > $LOGFILE
-	return 0 
-    else
-        debug " Running under z/VM";
-	echo " Running under z/VM" > $LOGFILE
-	# Is vmcp installed
-	which vmcp > /dev/null 2>&1
-    	if [ $? -eq 1 ] 
-    	then
-		# is hcp installed
-		which hcp > /dev/null 2>&1
-		if [ $? -eq 1 ]
- 		then
-                        debug " No cp tool installed";
-			echo " No cp tool installed" > $LOGFILE 
-			return 0
-		else
-			cp_tool=hcp
-                        debug " Installed CP tool: $cp_tool";
-			echo " Installed CP tool: $cp_tool" > $LOGFILE 
-			return 1
-		fi
-	else
-		cp_tool=vmcp
-                debug " Installed CP tool: $cp_tool";
-		echo " Installed CP tool: $cp_tool" > $LOGFILE 
-		return 1
-	fi
-     fi
-}
-
-# log files
-collect_log()
-{
-    debug "Copy log files";
-    echo "Copy log files" > $LOGFILE
-    for i in $LOGFILES
-    do
-	collect_file_contents $i
-    done
-}
-
-# create gzip-ped tar file
-create_package()
-{
-    cd $WORKPATH/..
-    tar -czf $pwd/$OUTFILENAME.cfg $WORKDIR 2>/dev/null && rm -rf $WORKPATH
-    debug
-    debug "Collected data was saved to:"
-    debug "  $pwd/$OUTFILENAME.cfg"
-}
-
-#
-# start of script
-#
-if [ $# -eq 0 ]; then
-    printhelp;
-    exit 1;
-fi
-
-
-kernel_version=`uname -r`
-kernel_version_tmp=`echo ${kernel_version:4:2} | sed s/[^0-9]//g`
-check_cmdline $@
-prepare_workdir
-printversion >$LOGFILE
-if [ $kernel_version_tmp -lt 13 ]
-	then
-		collect_s390dbf
-	fi
-collect_procfs $PROCFILES
-collect_cmdsout "$CMDS" "$CMDOUTPUT"
-if [ "${kernel_version:2:1}" \> 4 ]
-    then
-	collect_sysfs
-    else
-	collect_procfs $PROCFILES_24
-fi
-collect_procfs_scsi
-check_zvm
-rc_check_zvm=$?
-collect_config
-collect_log
-create_package
-
-exit 0;
-
-#
-# end of script
+# Author(s): Swen Schillig    <swen@vnet.ibm.com>
 #
+###############################################################################
 
-#EOF
+use strict;
+use warnings;
+use English;
+use Cwd;
+use File::Temp qw/ tempdir /;
+use Getopt::Long;
+
+sub version {
+	print "$PROGRAM_NAME: version %S390_TOOLS_VERSION%.\n";
+	print "Copyright IBM Corp. 2008.\n";
+}
+
+sub usage
+{
+	print <<MSG
+Usage: $PROGRAM_NAME [<options>]
+
+$PROGRAM_NAME collects all system information required for analysis.
+
+Options:
+
+        -h, --help
+		print this help text and exit.
+	
+	-v, --version
+		print version information and exit.
+
+	-o, --output
+		specify the name of the output file
+MSG
+}
+
+my $out_file="config";
+my $temp_dir = tempdir( CLEANUP => 1);
+
+Getopt::Long::Configure(qw/ bundling /);
+GetOptions('h|help' => sub {usage(); exit 0;},
+	   'v|version' => sub {version(); exit 0;},
+	   'o|output=s' => \$out_file,
+	  ) or do {
+		print "Invalid usage !\n";
+		usage();
+		exit 1;
+	};
+
+system("mkdir -p $temp_dir/sys/block");
+system("mkdir -p $temp_dir/sys/devices");
+system("mkdir -p $temp_dir/sys/class");
+system("rsync -a --inplace /sys/block/dm* /sys/block/sd* $temp_dir/sys/block 2>/dev/null");
+system("rsync -a --inplace --exclude=chpd* /sys/devices/css0 $temp_dir/sys/devices 2>/dev/null"); 
+system("rsync -a --inplace /sys/class/fc_host /sys/class/scsi_device /sys/class/scsi_tape /sys/class/fc_remote_ports $temp_dir/sys/class 2>/dev/null");
+system("rsync -a --inplace /dev/mapper $temp_dir/dev 2>/dev/null");
+system("tar -czf $out_file.cfg -C $temp_dir sys dev 2>/dev/null");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8 new/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8
--- old/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8	2008-09-30 23:29:06.000000000 +0200
+++ new/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8	2008-10-16 10:36:31.000000000 +0200
@@ -1,16 +1,15 @@
 .TH ZIOMON_ZFCPCONF 8 "Jul 2008" "s390-tools"
 
 .SH NAME
-ziomon_zfcpconf \- Collect configuration data for fcp adapters.
+ziomon_fcpconf \- Collect configuration data for fcp adapters.
 
 .SH SYNOPSIS
-.B ziomon_zfcpconf
-[-h] [-V] [-v] outfile
+.B ziomon_fcpconf
+[-h] [-v] [-o <outfile>]
 
 .SH DESCRIPTION
-.B ziomon_zfcpconf
-collects various configuration-related data and writes to a file
-.IR outfile .cfg.
+.B ziomon_fcpconf
+collects various fcp configuration-related data and writes to a file.
 
 .SH OPTIONS
 .TP
@@ -22,12 +21,8 @@
 Print version information, then exit.
 
 .TP
-.BR "\-V" " or " "\-\-verbose"
-Be verbose.
-
-.TP
-.BR outfile
-specifies the base name of the file to collect the information in.
+.BR "\-o" " or " "\-\-output"
+Specify the outfile basename. The suffix .cfg will be appended. Defaults to 'config'.
 
 
 .SH AUTHORS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c new/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c
--- old/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c	2008-10-05 12:44:20.000000000 +0200
+++ new/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c	2008-10-21 11:00:47.000000000 +0200
@@ -118,7 +118,7 @@
 
 static struct hist_log2 clat = {
 	.first = 0,
-	.delta = 1,
+	.delta = 1000,
 	.num = BLKIOMON_CHAN_LAT_BUCKETS
 };
 
@@ -251,12 +251,12 @@
 
 	stat = &dstat->msg.stat;
 	update_stat_variance(&stat->chan_lat, dd->chan_lat);
-	update_stat_variance(&stat->fabr_lat, dd->fabr_lat);
+	update_stat_variance(&stat->fabr_lat, dd->fabr_lat / 1000);
 	update_stat_variance(&stat->inb, dd->inb_usage);
 	update_stat_variance(&stat->outb, dd->outb_usage);
-	zfcpdd_account_hist_log2(stat->chan_lat_hist, dd->chan_lat / 1024,
+	zfcpdd_account_hist_log2(stat->chan_lat_hist, dd->chan_lat,
 				    &clat);
-	zfcpdd_account_hist_log2(stat->fabr_lat_hist, dd->fabr_lat / 1024,
+	zfcpdd_account_hist_log2(stat->fabr_lat_hist, dd->fabr_lat / 1000,
 				    &flat);
 	stat->count++;
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)