merge Alan Cox's earlier 'filename patch' add patch for BZ 129314, more
verbose message about CPU mismatch between accounting file and running system
This commit is contained in:
parent
cb2f31d98f
commit
82590b4156
13
sysstat-5.0.5-append-msg.patch
Normal file
13
sysstat-5.0.5-append-msg.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- sysstat-5.0.5/sadc.c.append-msg 2004-09-29 13:15:48.000000000 -0400
|
||||
+++ sysstat-5.0.5/sadc.c 2004-09-29 13:21:27.000000000 -0400
|
||||
@@ -747,7 +747,9 @@
|
||||
create_sa_file(ofd, ofile, file_stats_size, flags);
|
||||
return;
|
||||
}
|
||||
- fprintf(stderr, _("Cannot append data to that file\n"));
|
||||
+ fprintf(stderr, _("Cannot append data to %s,"
|
||||
+ " cpu count changed from %d to %d\n"),
|
||||
+ ofile, file_hdr.sa_proc, cpu_nr);
|
||||
exit(1);
|
||||
}
|
||||
|
14
sysstat.spec
14
sysstat.spec
@ -1,6 +1,6 @@
|
||||
Name: sysstat
|
||||
Version: 5.0.5
|
||||
Release: 1
|
||||
Release: 5.fc
|
||||
Summary: The sar and iostat system monitoring commands.
|
||||
License: GPL
|
||||
Group: Applications/System
|
||||
@ -15,6 +15,8 @@ Patch2: sysstat-5.0.0-history.patch
|
||||
Patch3: sysstat-5.0.5-statreset.patch
|
||||
Patch4: sysstat-5.0.5-overrun.patch
|
||||
Patch5: sysstat-5.0.5-lib64init.patch
|
||||
Patch6: sysstat-5.0.5-append-msg.patch
|
||||
Patch7: sysstat-5.0.5-filename.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
@ -35,6 +37,9 @@ activity.
|
||||
%patch2 -p1 -b .history
|
||||
%patch3 -p1 -b .statreset
|
||||
%patch4 -p1 -b .overrun
|
||||
# see patch5 below
|
||||
%patch6 -p1 -b .append-msg
|
||||
%patch7 -p1 -b .filename
|
||||
|
||||
# Fix initscript for lib64 systems
|
||||
|
||||
@ -51,7 +56,7 @@ make CFLAGS="$CFLAGS" PREFIX=%{_prefix} LIB_DIR=%{_libdir} MAN_DIR=%{_mandir} DA
|
||||
# Thou shalt not write to source files or patches
|
||||
rm -f sysstat.crond
|
||||
%if %_lib == "lib64"
|
||||
perl -p -e "s|/lib|/lib64|g" %{SOURCE1} > sysstat.crond
|
||||
perl -p -e "s|/lib/|/lib64/|g" %{SOURCE1} > sysstat.crond
|
||||
%else
|
||||
cat %{SOURCE1} > sysstat.crond
|
||||
%endif
|
||||
@ -119,6 +124,11 @@ rm -rf %{buildroot}
|
||||
/var/log/sa
|
||||
|
||||
%changelog
|
||||
* Thu Sep 30 2004 Charles Bennett <ccb@redhat.com> 5.0.5-5.fc
|
||||
- bring in filename and append-msg patch
|
||||
- append-msg adds verbose text for when saNN data file cpu count
|
||||
- does not match cpu count on the currently running system
|
||||
|
||||
* Wed Jun 30 2004 Nils Philippsen <nphilipp@redhat.com>
|
||||
- version 5.0.5
|
||||
- remove some obsolete patches
|
||||
|
Loading…
Reference in New Issue
Block a user