refresh

diff --git a/meta b/meta
index 58487bb86bd91d455198b05405539fd5c347c68b..ebdda4f673c5b1d3b1fc0f052faf07bc84b2fc0c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: dc4c00c1fd0859557890a2c6af5d62bff018bae8
-Head: 23e9a53f77a2776b663ce9541cc744bc987ca7b0
+Previous: a9b0087c6f3775fa9c04fc4c6052805a192d054b
+Head: 1b4a23934cccf05a770fec86f6422788a5a52ee9
 Applied:
   daemon: 32ca7dbd7bb04dabb504faa3ffe319e5f965d716
   cfg: 91fd5f444591ae8691a5bcf155467d0e7c493963
-  log: 4f7ae895e5b80c367279bc94ee532d53db4cd0db
-  refresh-temp: 23e9a53f77a2776b663ce9541cc744bc987ca7b0
+  log: 1b4a23934cccf05a770fec86f6422788a5a52ee9
 Unapplied:
 Hidden:

diff --git a/patches/log b/patches/log
index 105a93d5520d98d4a8aa5f7704b8ad2eb7927722..2c27c3dcee3eb95fee5a320ae7f0daa902343cb7 100644 (file)
--- a/patches/log
+++ b/patches/log
@@ -1,5 +1,5 @@
 Bottom: 3d9238d760c3f6458939674d7c9d6e3cd9ccd553
-Top:    8d9d24a7b5bdfb3bfcf14bcd32fd20a7b0899eaf
+Top:    a6f613d73c16c90079e3b7f2778739cf6811510a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-28 16:35:30 -0700
 
@@ -57,18 +57,25 @@ index 535a755..7c8b84b 100644
                f = stdout;
  
 diff --git a/src/acme.c b/src/acme.c
-index 03e96ad..adf8d1f 100644
+index 03e96ad..7428a57 100644
 --- a/src/acme.c
 +++ b/src/acme.c
-@@ -91,9 +91,9 @@ static void gen_opts_temp(FILE *f)
+@@ -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_\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_\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");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b695281..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: 8d9d24a7b5bdfb3bfcf14bcd32fd20a7b0899eaf
-Top:    a6f613d73c16c90079e3b7f2778739cf6811510a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-29 10:51:27 -0700
-
-Refresh of log
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index adf8d1f..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 /var/log/ibacm_\n");
-+      fprintf(f, "# log_file /var/log/ibacm.log\n");
-       fprintf(f, "\n");
--      fprintf(f, "log_file /var/log/ibacm_\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");