Hello community, here is the log from the commit of package sysstat.2515 for openSUSE:13.1:Update checked in at 2014-02-05 13:22:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/sysstat.2515 (Old) and /work/SRC/openSUSE:13.1:Update/.sysstat.2515.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysstat.2515" Changes: -------- New Changes file: --- /dev/null 2013-11-25 01:44:08.036031256 +0100 +++ /work/SRC/openSUSE:13.1:Update/.sysstat.2515.new/sysstat.changes 2014-02-05 13:22:55.000000000 +0100 @@ -0,0 +1,729 @@ +------------------------------------------------------------------- +Wed Jan 29 12:55:01 UTC 2014 - [email protected] + +- avoid accidental rewriting of the unit file when running quilt setup + +------------------------------------------------------------------- +Mon Jan 27 11:37:16 UTC 2014 - [email protected] + +- rename nfsiostat to nfsiostat-sysstat because of a name collision + with a binary from nfs-utils (bnc#814447) + * added sysstat-rename_nfsiostat.patch + +------------------------------------------------------------------- +Fri Nov 9 15:36:58 UTC 2012 - [email protected] + +- fixed two typos in spec related to service unit, which prevented + succesful startup (bnc#783886) +- service unit included hardcoded /usr/lib, so patching + sysstat.service to use correct libdir + +------------------------------------------------------------------- +Tue Oct 16 12:59:50 UTC 2012 - [email protected] + +- increased the default number of days for how long will sysstat + keep the log files (fate#313767) + +------------------------------------------------------------------- +Thu May 17 12:39:53 UTC 2012 - [email protected] + +- update to 10.0.5 + * [Alain Chereau]: Options -g and -T added to iostat. These options + enable the user to display statistics for groups of devices. + * [Vitezslav Cizek]: sadc now overwrites its standard daily data + file when this file is from a past month. + - fixes bnc#758356 + * sadf: Change time format from HH-MM-SS to HH:MM:SS in the + various reports displayed by sadf. + * XSD document updated: Added a maxOccurs indicator for the timestamp element. + * Added option --enable-collect-all to configure script. This + option tells sadc to collect all possible activities, including optional ones. + * [Peter Schiffer]: Set exit code to 0 for sa2 shell script. + * NLS updated. Croatian translation added. + * iostat and sadc manual pages updated. + * FAQ updated. + * CREDITS file updated. + +------------------------------------------------------------------- +Mon Mar 12 17:27:04 UTC 2012 - [email protected] + +- update to 10.0.4 + * [Andrey Borzenkov]: Don't take virtual devices into account in + sar -b results. + * [Peter Schiffer]: iostat didn't display target device + information when a symbolic link was specified as a parameter. + This is now fixed. + * The number of jiffies spent by a CPU in guest mode given by the + corresponding counter in /proc/stat may be slightly different + from that included in the user counter. Take this into account + when calculating current time interval value. + * configure script updated: Added --disable-stripping option. + Using this option tells configure to NOT strip object files. + * FAQ updated. + * sa1 manual page updated. + * NLS updated. Serbian translation added. + +- drop sysstat-do-not-strip.patch (use new configure option + --disable-stripping instead) + +------------------------------------------------------------------- +Wed Feb 15 10:01:27 UTC 2012 - [email protected] + +- pass '-S ALL' to first run of sadc after boot to properly + include disk and interrupt statistics in the reports (bnc#746517) + +------------------------------------------------------------------- +Wed Nov 30 09:04:14 UTC 2011 - [email protected] + +- update to sysstat-10.0.3 + * sadf: New output format added: JSON (JavaScript Object + Notation). This format can be displayed with sadf's option -j. + * [Jürgen Heinemann]: Fixed a bug in sadf XML output. + * [Jürgen Heinemann]: Fixed several bugs in DTD and XSD + documents. + * [Petr Uzel]: Fixed random crash with iostat when called with + option -N [NOVELL Bug#729130]. + * sadf manual page updated. +- drop sysstat-fix-iostat-crash.patch (merged upstream) + +------------------------------------------------------------------- +Wed Nov 9 12:25:47 UTC 2011 - [email protected] + +- add sysstat-fix-iostat-crash.patch (bnc#729130) + +------------------------------------------------------------------- +Thu Oct 27 07:12:57 UTC 2011 - [email protected] + +- Generate the reports before midnight and simplify the cron file + (bnc#720609) + +------------------------------------------------------------------- +Wed Oct 26 13:59:26 UTC 2011 - [email protected] + +- don't enable sysstat by default (bnc#725791) +- don't use /var/lock (bnc#725785) + +------------------------------------------------------------------- +Mon Oct 17 15:16:34 UTC 2011 - [email protected] + +- Add systemd service for sysstat (bnc#723858). + +------------------------------------------------------------------- +Mon Sep 19 08:04:02 UTC 2011 - [email protected] + +- update to sysstat-10.0.2 + - see /usr/share/doc/packages/sysstat/CHANGES + +------------------------------------------------------------------- +Thu Aug 11 07:31:36 UTC 2011 - [email protected] + +- enable boot.sysstat service on new installation (bnc#711574) + +------------------------------------------------------------------- +Mon Jun 27 12:40:36 UTC 2011 - [email protected] + +- update to sysstat-10.0.1 + - see /usr/share/doc/packages/sysstat/CHANGES for + full list of changes +- update patches +- get rid of obsolete --disable-smp-race configure option +- use --enable-debug-info configure option +- install /var/lock/sa as ghost file +- use spec-cleaner + +------------------------------------------------------------------- +Mon Mar 7 11:36:37 UTC 2011 - [email protected] + +- make /etc/sysstat/sysstat config(noreplae) (bnc#674719) + +------------------------------------------------------------------- +Sun Oct 31 12:37:02 UTC 2010 - [email protected] + +- Use %_smp_mflags + +------------------------------------------------------------------- +Wed Oct 20 12:26:16 CEST 2010 - [email protected] + +- update to 9.0.6.1 + * Because of a change in /proc/interrupts file format, mpstat + was no longer counting the proper number of interrupts. This + is now fixed. + * iostat manual page updated. + * NLS updated. + +- update to 9.0.6 + * "sadf -x" now takes into account options -s and -e (which + specify a starting and ending time) and also interval and + count parameters [DEBIAN bug#546259]. + * Option -C added to sadf. Use it to tell sadf to display comments + present in file (also works with XML format). + * sar and sadf sometimes didn't handle COMMENT records properly. + This is now fixed. + * XML output (displayed by sadf -x) modified for kernel tables + statistics. + * XSD and DTD documents updated. + * [Yibin Shen]: HZ variable was not explicitly set in sadc.c. This is now fixed. + * [Lans Carstensen]: sargraph added (sargraph is a shell script used to make graphs + based on sadf XML output). + * sadf manual page updated. + * FAQ updated. + * NLS updated. + * CREDITS file updated. + +- update to 9.0.5 + * sysstat should now be able to pretty print device names whose + minor numbers are greater than or equal to 256. (Tests have + been made on a large 26TB RHEL5/PP Linux cluster.) + * sadc manual page updated. + * NLS updated. + * FAQ updated. + +------------------------------------------------------------------- +Sun Aug 29 18:17:26 UTC 2010 - [email protected] + +- Do not hardcode build dates, make build-compare happy + +------------------------------------------------------------------- +Fri May 28 12:16:58 UTC 2010 - [email protected] + +- add sysstat-do-not-strip.patch + +------------------------------------------------------------------- +Wed Aug 5 12:56:54 CEST 2009 - [email protected] + +- updated to 9.0.4 + * [Jonathan Kamens]: Fix double free/memory corruption bug + with sadc. + * [Jeroen Roovers]: Get entirely rid of implicit rule for ++++ 532 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.sysstat.2515.new/sysstat.changes New: ---- isag.desktop sysstat-10.0.5.tar.bz2 sysstat-8.0.4-pagesize.diff sysstat-8.0.4-sysconfdir.diff sysstat-8.1.6-sa1sa2lock.diff sysstat-9.0.4-no-build-date.patch sysstat-rename_nfsiostat.patch sysstat.changes sysstat.cron.suse sysstat.init.suse sysstat.service sysstat.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ # # spec file for package sysstat # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: sysstat Version: 10.0.5 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0+ Group: System/Monitoring Url: http://pagesperso-orange.fr/sebastien.godard/ Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 Source1: isag.desktop Source2: sysstat.cron.suse Source3: sysstat.init.suse Source4: sysstat.service # PATCH-FIX-OPENSUSE should be upstreamed # add locking to scripts sa1 and sa2 (bnc#7861) Patch0: sysstat-8.1.6-sa1sa2lock.diff # PATCH-FIX-OPENSUSE should be upstreamed # use getpagesize() instead of kb_shift for hugetable archs Patch2: sysstat-8.0.4-pagesize.diff # PATCH-FIX-OPENSUSE use /etc/sysstat for config files # instead of /etc/sysconfig since the files do not match # the format used there (should be configure option) Patch3: sysstat-8.0.4-sysconfdir.diff # PATCH-FIX-OPENSUSE avoid build dates in generated files Patch4: sysstat-9.0.4-no-build-date.patch Patch5: sysstat-rename_nfsiostat.patch PreReq: %fillup_prereq PreReq: %insserv_prereq Requires: gettext Requires: procmail %{?systemd_requires} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: findutils BuildRequires: sed BuildRequires: systemd BuildRequires: update-desktop-files %description Sar and Iostat commands for Linux. The sar command collects and reports system activity information. The iostat command reports CPU statistics and I/O statistics for TTY devices and disks. The information collected by sar and iostat can be saved in a binary file for future inspection. Both commands now support SMP machines when displaying CPU utilization. %package isag Summary: Interactive System Activity Grapher for sysstat Group: System/Monitoring Requires: gnuplot Requires: sysstat = %{version} Requires: tk %description isag This package includes the isag command, which graphically displays the system activity data stored in a binary data produced by a sar command from a sysstat package. %prep %setup -q %patch0 %patch2 %patch3 %patch4 # bnc814447: rename nfsiostat to nfsiostat-sysstat %patch5 -p1 mv man/nfsiostat.in man/nfsiostat-sysstat.in mv nfsiostat.c nfsiostat-sysstat.c mv nfsiostat.h nfsiostat-sysstat.h cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} . %build export conf_dir="%{_sysconfdir}/sysstat" export sa_lib_dir="%{_libdir}/sa" export cron_owner=root export LFLAGS="-L. -lsyscom" export history="60" %configure \ --enable-nls \ --disable-man-group \ --enable-debug-info \ --disable-stripping make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_localstatedir}/log/sa %{buildroot}%{_sbindir} %make_install install -D -m 0644 isag.desktop %{buildroot}%{_datadir}/applications/isag.desktop %suse_update_desktop_file isag cp contrib/isag/isag %{buildroot}%{_bindir} cp contrib/isag/isag.1 %{buildroot}%{_mandir}/man1 rm -rf %{buildroot}%{_datadir}/doc/sysstat* install -D -m 0755 sysstat.cron.suse %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron install -D -m 0755 sysstat.init.suse %{buildroot}%{_sysconfdir}/init.d/boot.sysstat install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service # change /usr/lib to /usr/lib64 or something else when needed if [ "%{_libdir}" != "/usr/lib" ]; then sed -i 's:/usr/lib/:%{_libdir}/:g' \ %{buildroot}%{_sysconfdir}/init.d/boot.sysstat \ %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron \ %{buildroot}%{_unitdir}/%{name}.service fi ln -s %{_sysconfdir}/init.d/boot.sysstat %{buildroot}%{_sbindir}/rcsysstat %find_lang %{name} install -d %{buildroot}%{_localstatedir}/lock/sa %{buildroot}%{_unitdir} %pre %service_add_pre sysstat.service %preun %{stop_on_removal boot.sysstat} %service_del_preun sysstat.service [ "$1" -gt 0 ] || rm -rf %{_localstatedir}/log/sa/* %post %{fillup_and_insserv boot.sysstat} %service_add_post sysstat.service %postun %{insserv_cleanup} %service_del_postun sysstat.service %clean rm -rf %{buildroot} %files -f "%{name}.lang" %defattr(-,root,root) %doc CHANGES COPYING CREDITS FAQ README TODO %doc %{_mandir}/man1/* %doc %{_mandir}/man5/* %doc %{_mandir}/man8/* %exclude %{_mandir}/man1/isag* %dir %{_sysconfdir}/sysstat %config(noreplace) %{_sysconfdir}/sysstat/sysstat %attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.cron %attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.ioconf %attr(755,root,root) %{_sysconfdir}/init.d/boot.sysstat %{_bindir}/* %{_sbindir}/* %exclude %{_bindir}/isag %{_libdir}/sa %{_unitdir}/sysstat.service %ghost %dir %{_localstatedir}/lock/sa %dir %{_localstatedir}/log/sa %files isag %defattr(-,root,root) %doc contrib/isag/README-isag %doc %{_mandir}/man1/isag* %{_bindir}/isag %{_datadir}/applications/isag.desktop %changelog ++++++ isag.desktop ++++++ [Desktop Entry] Version=1.0 Name=Isag System Activity Grapher GenericName=System Monitor Comment=Interactive System Activity Grapher for sysstat Exec=isag Icon=utilities-system-monitor Type=Application Categories=System;Monitor; ++++++ sysstat-8.0.4-pagesize.diff ++++++ --- common.h +++ common.h @@ -125,8 +125,8 @@ * kB <-> number of pages. * Page size depends on machine architecture (4 kB, 8 kB, 16 kB, 64 kB...) */ -#define KB_TO_PG(k) ((k) >> kb_shift) -#define PG_TO_KB(k) ((k) << kb_shift) +#define KB_TO_PG(k) ((k) / (getpagesize()/1024) ) +#define PG_TO_KB(k) ((k) * (getpagesize()/1024) ) /* *************************************************************************** ++++++ sysstat-8.0.4-sysconfdir.diff ++++++ Index: FAQ =================================================================== --- FAQ.orig 2012-05-09 09:11:29.000000000 +0200 +++ FAQ 2014-01-27 12:16:27.492607489 +0100 @@ -426,9 +426,9 @@ to verify that for yourself. Nor do you have to be concerned about using up all your disk space. sar will use a few hundred kilobytes for a whole day's worth of data, and it normally only stores one week worth (this can be configured via the HISTORY -variable in the /etc/sysconfig/sysstat file). It is entirely self limiting. +variable in the /etc/sysstat/sysstat file). It is entirely self limiting. Moreover, you can ask sar to compress its datafiles older than a certain -number of days: see the COMPRESSAFTER parameter in the /etc/sysconfig/sysstat +number of days: see the COMPRESSAFTER parameter in the /etc/sysstat/sysstat configuration file. ~~~ @@ -468,7 +468,7 @@ another file or create a new one. See al By default sar saves its data in the standard system activity data file, the /var/log/sa/sa<DD> file, where <DD> is the current day in the month. To prevent sar from overwriting any existing files, just set the variable -HISTORY in /etc/sysconfig/sysstat to the number of days during which data +HISTORY in /etc/sysstat/sysstat to the number of days during which data must be kept. When this variable has a value greater than 28, sa1 script uses a month-by-month directory structure; datafiles are named YYYYMM/saDD and the script maintains links to these datafiles to mimic the standard Index: README =================================================================== --- README.orig 2011-01-02 08:13:28.000000000 +0100 +++ README 2014-01-27 12:16:27.492607489 +0100 @@ -88,8 +88,8 @@ ${PREFIX}/share/locale/*/LC_MESSAGES/sys ${PREFIX}/share/doc/sysstat-x.y.z/* /var/log/sa ${INIT_DIR}/sysstat -/etc/sysconfig/sysstat -/etc/sysconfig/sysstat.ioconf +/etc/sysstat/sysstat +/etc/sysstat/sysstat.ioconf /etc/cron.d/sysstat /etc/rc.d/rc.sysstat for [SLACKWARE] ${RC_DIR}/rc2.d/S03sysstat ++++++ sysstat-8.1.6-sa1sa2lock.diff ++++++ Index: sa1.in =================================================================== --- sa1.in.orig +++ sa1.in @@ -30,17 +30,24 @@ then rm -f ${CURRENTFILE} ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE} fi +set -e umask 0022 ENDIR=@SA_LIB_DIR@ cd ${ENDIR} + +LOCKFILE=/var/run/sysstat/sadc.LOCK +mkdir -p /var/run/sysstat +lockfile -r2 -30 "$LOCKFILE" 2>/dev/null +trap "/bin/rm -f $LOCKFILE" EXIT + [ "$1" = "--boot" ] && shift && BOOT=y || BOOT=n if [ $# = 0 ] && [ "${BOOT}" = "n" ] then # Note: Stats are written at the end of previous file *and* at the # beginning of the new one (when there is a file rotation) only if # outfile has been specified as '-' on the command line... - exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 - + ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 - else - exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* - + ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* - fi Index: sa2.in =================================================================== --- sa2.in.orig +++ sa2.in @@ -48,6 +48,17 @@ ENDIR=@bindir@ DFILE=${CURRENTDIR}/${CURRENTFILE} [ -f "$DFILE" ] || exit 0 cd ${ENDIR} + +LOCKFILE=/var/run/sysstat/sadc.LOCK +mkdir -p /var/run/sysstat +if ! lockfile -r6 -600 $LOCKFILE 2>/dev/null; then + if test `find $LOCKFILE -mmin +180 2>/dev/null`; then + rm -f $LOCKFILE + logger -p cron.alert "$0: detected an old lockfile \"$LOCKFILE\"." + fi +fi +trap "/bin/rm -f $LOCKFILE" EXIT + [ -L ${RPT} ] && rm -f ${RPT} ${ENDIR}/sar $* -f ${DFILE} > ${RPT} find ${DDIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' -o -name 'sar??.bz2' -o -name 'sa??.bz2' \) \ ++++++ sysstat-9.0.4-no-build-date.patch ++++++ Index: sadf.c =================================================================== --- sadf.c.orig +++ sadf.c @@ -43,7 +43,7 @@ # define _(string) (string) #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } long interval = -1, count = 0; Index: sadc.c =================================================================== --- sadc.c.orig +++ sadc.c @@ -52,7 +52,7 @@ #include "sensors/error.h" #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } long interval = 0; Index: pidstat.c =================================================================== --- pidstat.c.orig +++ pidstat.c @@ -43,7 +43,7 @@ #define _(string) (string) #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } unsigned long long uptime[3] = {0, 0, 0}; Index: mpstat.c =================================================================== --- mpstat.c.orig +++ mpstat.c @@ -41,7 +41,7 @@ #define _(string) (string) #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } unsigned long long uptime[3] = {0, 0, 0}; Index: sar.c =================================================================== --- sar.c.orig +++ sar.c @@ -40,7 +40,7 @@ #define _(string) (string) #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } /* Interval and count parameters */ Index: iostat.c =================================================================== --- iostat.c.orig +++ iostat.c @@ -47,7 +47,7 @@ #define _(string) (string) #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } struct stats_cpu *st_cpu[2]; Index: cifsiostat.c =================================================================== --- cifsiostat.c.orig +++ cifsiostat.c @@ -40,7 +40,7 @@ #define _(string) (string) #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } unsigned long long uptime[2] = {0, 0}; Index: nfsiostat.c =================================================================== --- nfsiostat.c.orig +++ nfsiostat.c @@ -39,7 +39,7 @@ #define _(string) (string) #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ +#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ char *sccsid(void) { return (SCCSID); } unsigned long long uptime[2] = {0, 0}; ++++++ sysstat-rename_nfsiostat.patch ++++++ commit 0b97789cd6b10bca691a9bf43b7cf95cc4fdf384 Author: Sebastien GODARD <[email protected]> Date: Sun Jan 26 09:17:03 2014 +0100 Rename nfsiostat command to nfsiostat-sysstat nfsiostat was added to the sysstat package in 2010, but such a command has already existed in the nfs-utils package since 2008. So to avoid confusion, rename nfsiostat to nfsiostat-sysstat and indicate it is now obsolete. The nfsiostat command from the sysstat package will be removed in a future version since we don't need two similar commands. Signed-off-by: Sebastien GODARD <[email protected]> Index: sysstat-10.0.5/Makefile.in =================================================================== --- sysstat-10.0.5.orig/Makefile.in 2012-01-02 14:36:00.000000000 +0100 +++ sysstat-10.0.5/Makefile.in 2014-01-27 12:06:50.519020183 +0100 @@ -156,7 +156,7 @@ NLSPOT= $(NLSPO:.po=.pot) % : %.o $(CC) -o $@ $(CFLAGS) $^ $(LFLAGS) -all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales +all: sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat locales common.o: common.c version.h common.h ioconf.h sysconfig.h @@ -225,9 +225,9 @@ mpstat.o: mpstat.c mpstat.h version.h co mpstat: mpstat.o librdstats.a libsyscom.a -nfsiostat.o: nfsiostat.c nfsiostat.h version.h common.h +nfsiostat-sysstat.o: nfsiostat-sysstat.c nfsiostat-sysstat.h version.h common.h -nfsiostat: nfsiostat.o librdstats.a libsyscom.a +nfsiostat-sysstat: nfsiostat-sysstat.o librdstats.a libsyscom.a cifsiostat.o: cifsiostat.c cifsiostat.h version.h common.h @@ -269,8 +269,8 @@ ifeq ($(INSTALL_DOC),y) $(INSTALL_DATA) $(MANGRPARG) man/mpstat.1 $(DESTDIR)$(MAN1_DIR) rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1* $(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR) - rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1* - $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat.1 $(DESTDIR)$(MAN1_DIR) + rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1* + $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat-sysstat.1 $(DESTDIR)$(MAN1_DIR) rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1* $(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR) ifeq ($(INSTALL_ISAG),y) @@ -286,7 +286,7 @@ ifeq ($(COMPRESS_MANPG),y) $(ZIP) $(DESTDIR)$(MAN1_DIR)/iostat.1 $(ZIP) $(DESTDIR)$(MAN1_DIR)/mpstat.1 $(ZIP) $(DESTDIR)$(MAN1_DIR)/pidstat.1 - $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat.1 + $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1 $(ZIP) $(DESTDIR)$(MAN1_DIR)/cifsiostat.1 ifeq ($(INSTALL_ISAG),y) $(ZIP) $(DESTDIR)$(MAN1_DIR)/isag.1 @@ -326,7 +326,7 @@ endif $(INSTALL_BIN) iostat $(DESTDIR)$(BIN_DIR) $(INSTALL_BIN) mpstat $(DESTDIR)$(BIN_DIR) $(INSTALL_BIN) pidstat $(DESTDIR)$(BIN_DIR) - $(INSTALL_BIN) nfsiostat $(DESTDIR)$(BIN_DIR) + $(INSTALL_BIN) nfsiostat-sysstat $(DESTDIR)$(BIN_DIR) $(INSTALL_BIN) cifsiostat $(DESTDIR)$(BIN_DIR) ifeq ($(INSTALL_ISAG),y) $(INSTALL_BIN) contrib/isag/isag $(DESTDIR)$(BIN_DIR) @@ -390,7 +390,7 @@ ifeq ($(INSTALL_DOC),y) rm -f $(DESTDIR)$(MAN1_DIR)/iostat.1* rm -f $(DESTDIR)$(MAN1_DIR)/mpstat.1* rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1* - rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1* + rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1* rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1* ifeq ($(INSTALL_ISAG),y) rm -f $(DESTDIR)$(MAN1_DIR)/isag.1 @@ -418,7 +418,7 @@ uninstall_base: uninstall_man uninstall_ rm -f $(DESTDIR)$(BIN_DIR)/iostat rm -f $(DESTDIR)$(BIN_DIR)/mpstat rm -f $(DESTDIR)$(BIN_DIR)/pidstat - rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat + rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat-sysstat rm -f $(DESTDIR)$(BIN_DIR)/cifsiostat ifeq ($(INSTALL_ISAG),y) rm -f $(DESTDIR)$(BIN_DIR)/isag @@ -476,7 +476,7 @@ po-files: endif clean: - rm -f sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat *.o *.a core TAGS + rm -f sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat *.o *.a core TAGS find nls -name "*.gmo" -exec rm -f {} \; almost-distclean: clean nls/sysstat.pot @@ -485,7 +485,7 @@ almost-distclean: clean nls/sysstat.pot rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in rm -f contrib/isag/isag rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5 - rm -f man/cifsiostat.1 man/nfsiostat.1 + rm -f man/cifsiostat.1 man/nfsiostat-sysstat.1 rm -f *.log config.status rm -rf autom4te.cache rm -f *.save *.old .*.swp data Index: sysstat-10.0.5/configure =================================================================== --- sysstat-10.0.5.orig/configure 2012-05-10 21:39:29.000000000 +0200 +++ sysstat-10.0.5/configure 2014-01-27 12:06:50.520020194 +0100 @@ -7868,7 +7868,7 @@ ac_config_files="$ac_config_files man/io # File must be renamed ac_config_files="$ac_config_files man/cifsiostat.1:man/cifsiostat.in" # File must be renamed -ac_config_files="$ac_config_files man/nfsiostat.1:man/nfsiostat.in" +ac_config_files="$ac_config_files man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in" # File must be renamed ac_config_files="$ac_config_files contrib/isag/isag" # Permissions must be changed @@ -8502,7 +8502,7 @@ do "man/sysstat.5") CONFIG_FILES="$CONFIG_FILES man/sysstat.5:man/sysstat.in" ;; "man/iostat.1") CONFIG_FILES="$CONFIG_FILES man/iostat.1:man/iostat.in" ;; "man/cifsiostat.1") CONFIG_FILES="$CONFIG_FILES man/cifsiostat.1:man/cifsiostat.in" ;; - "man/nfsiostat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat.1:man/nfsiostat.in" ;; + "man/nfsiostat-sysstat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in" ;; "contrib/isag/isag") CONFIG_FILES="$CONFIG_FILES contrib/isag/isag" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; Index: sysstat-10.0.5/configure.in =================================================================== --- sysstat-10.0.5.orig/configure.in 2012-05-10 21:39:23.000000000 +0200 +++ sysstat-10.0.5/configure.in 2014-01-27 12:06:50.520020194 +0100 @@ -565,7 +565,7 @@ AC_CONFIG_FILES([man/sar.1:man/sar.in]) AC_CONFIG_FILES([man/sysstat.5:man/sysstat.in]) # File must be renamed AC_CONFIG_FILES([man/iostat.1:man/iostat.in]) # File must be renamed AC_CONFIG_FILES([man/cifsiostat.1:man/cifsiostat.in]) # File must be renamed -AC_CONFIG_FILES([man/nfsiostat.1:man/nfsiostat.in]) # File must be renamed +AC_CONFIG_FILES([man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in]) # File must be renamed AC_CONFIG_FILES([contrib/isag/isag], [chmod +x contrib/isag/isag]) # Permissions must be changed AC_OUTPUT(Makefile) Index: sysstat-10.0.5/nfsiostat.c =================================================================== --- sysstat-10.0.5.orig/nfsiostat.c.orig 2012-03-03 15:01:39.000000000 +0100 +++ sysstat-10.0.5/nfsiostat.c 2014-01-27 12:16:27.492607489 +0100 @@ -28,7 +28,7 @@ #include <sys/utsname.h> #include "version.h" -#include "nfsiostat.h" +#include "nfsiostat-sysstat.h" #include "common.h" #ifdef USE_NLS ++++++ sysstat.cron.suse ++++++ # crontab for sysstat # Activity reports every 10 minutes everyday */10 * * * * root [ -x /usr/lib/sa/sa1 ] && exec /usr/lib/sa/sa1 -S ALL 1 1 # Update reports every 6 hours 55 5,11,17,23 * * * root [ -x /usr/lib/sa/sa2 ] && exec /usr/lib/sa/sa2 -A ++++++ sysstat.init.suse ++++++ #! /bin/sh # Copyright (c) 2000-2009 SuSE GmbH Nuernberg, Germany. # # /etc/init.d/boot.sysstat # ### BEGIN INIT INFO # Provides: boot.sysstat # Required-Start: boot.rootfsck boot.cleanup boot.clock # Should-Start: $local_fs $remote_fs # Required-Stop: boot.rootfsck boot.cleanup # Should-Stop: $local_fs $remote_fs # Default-Start: B # Default-Stop: $null # Short-Description: Write information about system start to sysstat log # Description: Write information about system start to sysstat log ### END INIT INFO . /etc/rc.status rc_reset case "$1" in start) echo "Running sadc" /usr/lib/sa/sa1 --boot -S ALL 1>/dev/null 2>&1 && ln -fs /etc/sysstat/sysstat.cron /etc/cron.d/sysstat || rc_failed 1 rc_status -v ;; stop) echo "Removing sysstat's crontab" /bin/rm -f /etc/cron.d/sysstat rc_status -v ;; check|status) echo -n "Checking for service sysstat: " test -L /etc/cron.d/sysstat && test "`readlink /etc/cron.d/sysstat`" == /etc/sysstat/sysstat.cron || rc_failed 3 rc_status -v ;; restart|reload|probe) rc_failed 3 ;; *) echo "Usage: $0 {start|stop|status}" exit 1 ;; esac rc_exit ++++++ sysstat.service ++++++ [Unit] Description=Write information about system start to sysstat log After=remote-fs.target local-fs.target Before=cron.service [Service] Type=oneshot ExecStart=/usr/lib/sa/sa1 --boot ExecStart=/bin/ln -fs /etc/sysstat/sysstat.cron /etc/cron.d/sysstat ExecStop=/bin/rm -f /etc/cron.d/sysstat StandardOutput=null RemainAfterExit=true [Install] WantedBy=default.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
