commit

diff --git a/meta b/meta
index a7654ceb7cc4d1e8e9f7124d5880900efb1270d1..d15aa551aa27770b93246b4322d32e1b69df7d1b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 567a8f9b7b9ccf93a3b9541128569fd94b16054c
+Previous: c0cf52efa6f784680ca4eb859b079e2521bdb150
 Head: 0a83fa0154a0d56f255abe95cc31f54661b2c6eb
 Applied:
-  log: 1b4a23934cccf05a770fec86f6422788a5a52ee9
   rel-1.0.2: 0a83fa0154a0d56f255abe95cc31f54661b2c6eb
 Unapplied:
 Hidden:

diff --git a/patches/log b/patches/log
deleted file mode 100644 (file)
index 2c27c3d..0000000
--- a/patches/log
+++ /dev/null
@@ -1,81 +0,0 @@
-Bottom: 3d9238d760c3f6458939674d7c9d6e3cd9ccd553
-Top:    a6f613d73c16c90079e3b7f2778739cf6811510a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-28 16:35:30 -0700
-
-ibacm: move default location of log file
-
-Make /var/log the default location of the acm log file.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 95ac15a..3dbb0c6 100644
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -9,15 +9,13 @@
- # log_file:\r
- # Specifies the location of the ACM service output.  The log file is used to\r
- # assist with ACM service debugging and troubleshooting.  The log_file can\r
--# be set to 'stdout', 'stderr', or the base name of a file.  If a file name\r
--# is specified, the actual name formed by appending a process ID and '.log'\r
--# extension to the end of the specified file name.\r
-+# be set to 'stdout', 'stderr', or the name of a file.\r
- # Examples:\r
- # log_file stdout\r
- # log_file stderr\r
--# log_file /tmp/acm_\r
-+# log_file /var/log/ibacm.log\r
- \r
--log_file acm_\r
-+log_file /var/log/ibacm.log\r
- \r
- # log_level:\r
- # Indicates the amount of detailed data written to the log file.  Log levels\r
-diff --git a/src/acm.c b/src/acm.c
-index 535a755..7c8b84b 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2598,7 +2598,6 @@ static void acm_log_options(void)
- static FILE *acm_open_log(void)
- {
-       FILE *f;
--      int n;
- 
-       if (!stricmp(log_file, "stdout"))
-               return stdout;
-@@ -2606,8 +2605,6 @@ static FILE *acm_open_log(void)
-       if (!stricmp(log_file, "stderr"))
-               return stderr;
- 
--      n = strlen(log_file);
--      sprintf(&log_file[n], "%05u.log", getpid());
-       if (!(f = fopen(log_file, "w")))
-               f = stdout;
- 
-diff --git a/src/acme.c b/src/acme.c
-index 03e96ad..7428a57 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -85,15 +85,13 @@ static void gen_opts_temp(FILE *f)
-       fprintf(f, "# log_file:\n");
-       fprintf(f, "# Specifies the location of the ACM service output.  The log file is used to\n");
-       fprintf(f, "# assist with ACM service debugging and troubleshooting.  The log_file can\n");
--      fprintf(f, "# be set to 'stdout', 'stderr', or the base name of a file.  If a file name\n");
--      fprintf(f, "# is specified, the actual name formed by appending a process ID and '.log'\n");
--      fprintf(f, "# extension to the end of the specified file name.\n");
-+      fprintf(f, "# be set to 'stdout', 'stderr', or the name of a file.\n");
-       fprintf(f, "# Examples:\n");
-       fprintf(f, "# log_file stdout\n");
-       fprintf(f, "# log_file stderr\n");
--      fprintf(f, "# log_file /tmp/acm_\n");
-+      fprintf(f, "# log_file /var/log/ibacm.log\n");
-       fprintf(f, "\n");
--      fprintf(f, "log_file acm_\n");
-+      fprintf(f, "log_file /var/log/ibacm.log\n");
-       fprintf(f, "\n");
-       fprintf(f, "# log_level:\n");
-       fprintf(f, "# Indicates the amount of detailed data written to the log file.  Log levels\n");