rpms/kerneloops/devel kerneloops-ignore-raid-warning.patch, NONE, 1.1 kerneloops.spec, 1.7, 1.8

Chuck Ebbert (cebbert) fedora-extras-commits at redhat.com
Mon Mar 17 23:02:33 UTC 2008


Author: cebbert

Update of /cvs/pkgs/rpms/kerneloops/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14033

Modified Files:
	kerneloops.spec 
Added Files:
	kerneloops-ignore-raid-warning.patch 
Log Message:
* Mon Mar 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-8
- Don't report a harmless RAID warning message (#437854)


kerneloops-ignore-raid-warning.patch:

--- NEW FILE kerneloops-ignore-raid-warning.patch ---
Don't trigger on a harmless RAID1 warning message.

Index: kerneloops-0.10/dmesg.c
===================================================================
--- kerneloops-0.10.orig/dmesg.c
+++ kerneloops-0.10/dmesg.c
@@ -156,37 +156,40 @@ static void extract_oops(char *buffer, i
 
 	i = 0;
 	while (i < linecount) {
-		if (linepointer[i] == NULL) {
+		char *c = linepointer[i];
+
+		if (c == NULL) {
 			i++;
 			continue;
 		}
 		if (oopsstart < 0) {
 			/* find start-of-oops markers */
-			if (strstr(linepointer[i], "general protection fault:"))
+			if (strstr(c, "general protection fault:"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "BUG:"))
+			if (strstr(c, "BUG:"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "kernel BUG at"))
+			if (strstr(c, "kernel BUG at"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "double fault:"))
+			if (strstr(c, "double fault:"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "Badness at"))
+			if (strstr(c, "Badness at"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "WARNING:"))
+			if (strstr(c, "WARNING:") &&
+			    !strstr(c, "appears to be on the same physical disk"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "Unable to handle kernel"))
+			if (strstr(c, "Unable to handle kernel"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "sysctl table check failed"))
+			if (strstr(c, "sysctl table check failed"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "------------[ cut here ]------------"))
+			if (strstr(c, "------------[ cut here ]------------"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "Oops:") && i >= 3)
+			if (strstr(c, "Oops:") && i >= 3)
 				oopsstart = i-3;
 			if (oopsstart >= 0 && testmode) {
 				printf("Found start of oops at line %i\n", oopsstart);
 				printf("    start line is -%s-\n", linepointer[oopsstart]);
 				if (oopsstart != i)
-					printf("    trigger line is -%s-\n", linepointer[i]);
+					printf("    trigger line is -%s-\n", c);
 			}
 			/* give the kernel some time to finish dumping the oops */
 			/* but not in testmode since that makes regression testins slow */


Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kerneloops.spec	17 Mar 2008 17:40:58 -0000	1.7
+++ kerneloops.spec	17 Mar 2008 23:01:56 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		kerneloops
 Version:	0.10
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Tool to automatically collect and submit kernel crash signatures
 
 Group:		System Environment/Base
@@ -11,6 +11,7 @@
 Patch1:		kerneloops-ignore-module-list.patch
 Patch2:		kerneloops-require-syslog-on-shutdown.patch
 Patch3:		kerneloops-performance.patch
+Patch4:		kerneloops-ignore-raid-warning.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -35,6 +36,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -75,6 +77,9 @@
 %doc %{_mandir}/man8/kerneloops.8.gz
 
 %changelog
+* Mon Mar 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-8
+- Don't report a harmless RAID warning message (#437854)
+
 * Mon Mar 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-7
 - Fix high CPU usage on startup with large system logs (#435544)
 




More information about the fedora-extras-commits mailing list