74 lines
3.8 KiB
Diff
74 lines
3.8 KiB
Diff
|
diff -up ppc64-diag-2.7.4/ela/Makefile.am.than ppc64-diag-2.7.4/ela/Makefile.am
|
||
|
|
--- ppc64-diag-2.7.4/ela/Makefile.am.than 2018-03-08 15:41:37.994892051 +0100
|
||
|
|
+++ ppc64-diag-2.7.4/ela/Makefile.am 2018-03-08 15:43:58.847464269 +0100
|
||
|
|
@@ -68,22 +68,22 @@ clean-local-ela:
|
||
|
|
CLEAN_LOCALS += clean-local-ela
|
||
|
|
|
||
|
|
install-exec-hook-ela:
|
||
|
|
- install -d --mode=755 $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/
|
||
|
|
- install -D --mode=744 $(CATALOG) $(DESTDIR)/etc/ppc64-diag/message_catalog/
|
||
|
|
+ install -d --mode=755 $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/
|
||
|
|
+ install -D --mode=744 $(CATALOG) $(DESTDIR)/usr/share/ppc64-diag/message_catalog/
|
||
|
|
install -D --mode=744 $(CATALOG_REGEX) \
|
||
|
|
- $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/
|
||
|
|
+ $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/
|
||
|
|
|
||
|
|
INSTALL_EXEC_HOOKS += install-exec-hook-ela
|
||
|
|
|
||
|
|
uninstall-hook-ela:
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/cxgb3
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/e1000e
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/exceptions
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/reporters
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/gpfs
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/cxgb3
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/e1000e
|
||
|
|
- rm -f $(DESTDIR)/etc/ppc64-diag/message_catalog/with_regex/gpfs
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/cxgb3
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/e1000e
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/exceptions
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/reporters
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/gpfs
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/cxgb3
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/e1000e
|
||
|
|
+ rm -f $(DESTDIR)/usr/share/ppc64-diag/message_catalog/with_regex/gpfs
|
||
|
|
|
||
|
|
UNINSTALL_HOOKS += uninstall-hook-ela
|
||
|
|
|
||
|
|
diff -up ppc64-diag-2.7.4/ela/catalogs.h.than ppc64-diag-2.7.4/ela/catalogs.h
|
||
|
|
--- ppc64-diag-2.7.4/ela/catalogs.h.than 2018-03-08 15:44:23.267910229 +0100
|
||
|
|
+++ ppc64-diag-2.7.4/ela/catalogs.h 2018-03-08 15:46:08.669835054 +0100
|
||
|
|
@@ -34,7 +34,7 @@ using namespace std;
|
||
|
|
#include <stdio.h>
|
||
|
|
#include <regex.h>
|
||
|
|
|
||
|
|
-#define ELA_CATALOG_DIR "/etc/ppc64-diag/message_catalog"
|
||
|
|
+#define ELA_CATALOG_DIR "/usr/share/ppc64-diag/message_catalog"
|
||
|
|
|
||
|
|
class Parser {
|
||
|
|
protected:
|
||
|
|
diff -up ppc64-diag-2.7.4/ela/explain_syslog.cpp.than ppc64-diag-2.7.4/ela/explain_syslog.cpp
|
||
|
|
--- ppc64-diag-2.7.4/ela/explain_syslog.cpp.than 2018-03-08 15:46:24.470123596 +0100
|
||
|
|
+++ ppc64-diag-2.7.4/ela/explain_syslog.cpp 2018-03-08 15:46:49.630583070 +0100
|
||
|
|
@@ -97,7 +97,7 @@ print_help(void)
|
||
|
|
printf(
|
||
|
|
"-b begin_time\tIgnore messages with timestamps prior to begin_time.\n"
|
||
|
|
"-C catalog_dir\tUse message catalog in catalog_dir. Defaults to\n"
|
||
|
|
-"\t\t\t/etc/ppc64-diag/message_catalog.\n"
|
||
|
|
+"\t\t\t/usr/share/ppc64-diag/message_catalog.\n"
|
||
|
|
"-d\t\tPrint debugging output on stderr.\n"
|
||
|
|
"-e end_time\tStop upon reading message with timestamp after end_time.\n"
|
||
|
|
"-h\t\tPrint this help text and exit.\n"
|
||
|
|
diff -up ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp.than ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp
|
||
|
|
--- ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp.than 2018-03-08 15:47:03.030827782 +0100
|
||
|
|
+++ ppc64-diag-2.7.4/ela/syslog_to_svclog.cpp 2018-03-08 15:47:10.770969131 +0100
|
||
|
|
@@ -682,7 +682,7 @@ print_help(void)
|
||
|
|
printf(
|
||
|
|
"-b begin_time\tIgnore messages with timestamps prior to begin_time.\n"
|
||
|
|
"-C catalog_dir\tUse message catalog in catalog_dir. Defaults to\n"
|
||
|
|
-"\t\t\t/etc/ppc64-diag/message_catalog.\n"
|
||
|
|
+"\t\t\t/usr/share/ppc64-diag/message_catalog.\n"
|
||
|
|
"-d\t\tPrint debugging output on stderr.\n"
|
||
|
|
"-e end_time\tStop upon reading message with timestamp after end_time.\n"
|
||
|
|
"-F\t\tDon't stop at EOF; process newly logged messages as they occur.\n"
|