You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
78 lines
3.5 KiB
78 lines
3.5 KiB
7 years ago
|
diff --git a/ela/catalogs.h b/ela/catalogs.h
|
||
|
|
index ce68a86..f77ee01 100644
|
||
|
|
--- a/ela/catalogs.h
|
||
|
|
+++ b/ela/catalogs.h
|
||
|
|
@@ -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 --git a/ela/explain_syslog.cpp b/ela/explain_syslog.cpp
|
||
|
|
index f2ecc25..fc96334 100644
|
||
|
|
--- a/ela/explain_syslog.cpp
|
||
|
|
+++ b/ela/explain_syslog.cpp
|
||
|
|
@@ -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 --git a/ela/syslog_to_svclog.cpp b/ela/syslog_to_svclog.cpp
|
||
|
|
index ca5cd2f..69a8db9 100644
|
||
|
|
--- a/ela/syslog_to_svclog.cpp
|
||
|
|
+++ b/ela/syslog_to_svclog.cpp
|
||
|
|
@@ -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"
|
||
|
|
diff -up ppc64-diag-2.7.4/ela/catalogs.h.than ppc64-diag-2.7.4/ela/catalogs.h
|
||
|
|
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 2017-09-15 18:56:29.914492445 +0200
|
||
|
|
+++ ppc64-diag-2.7.4/ela/Makefile.am 2017-09-15 19:00:31.470337345 +0200
|
||
|
|
@@ -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
|
||
|
|
|