refresh

diff --git a/meta b/meta
index d47fa6658786701a5b02c83ca3dc803a9419dd64..88e6f0c1bf77eba7debbb8860f9e5640155a15e1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: a9e3675ae62ba4ef5dc0d5702e29b5b91d8e4089
-Head: cb2088c3179117fb4fabb34628cdc44556241f5f
+Previous: ef3e8f10ce2030bcf2f0a7ea9f6338df9a36b92c
+Head: 5c2ee180bbae2240851795a57be34a6d8d4cd4e0
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 7b29fa2e46e60f2cec734b59f7efe8cdeec59660
   cfg: 66af10c14df1055d97422bc056dc0897ac3a2773
-  log: 297ca7056eb02223917f278363f952b4c35eb146
-  refresh-temp: cb2088c3179117fb4fabb34628cdc44556241f5f
+  log: 5c2ee180bbae2240851795a57be34a6d8d4cd4e0
 Unapplied:
 Hidden:

diff --git a/patches/log b/patches/log
index 0f0e4f875538fb3a8e4f61e03b2edd41d48c10f0..d04fc6ff36495b83b619bbdc5364a18c8c92eaf8 100644 (file)
--- a/patches/log
+++ b/patches/log
@@ -1,5 +1,5 @@
 Bottom: a9a7ff03d17186f855af81adb232170085e921d9
-Top:    a9a7ff03d17186f855af81adb232170085e921d9
+Top:    771097925f08dc918e0aa61f53943911d30ccd0e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-28 16:35:30 -0700
 
@@ -12,4 +12,37 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/acm_opts.cfg b/acm_opts.cfg
+old mode 100644
+new mode 100755
+index 95ac15a..3e3a4a0
+--- a/acm_opts.cfg
++++ b/acm_opts.cfg
+@@ -15,9 +15,9 @@
+ # Examples:\r
+ # log_file stdout\r
+ # log_file stderr\r
+-# log_file /tmp/acm_\r
++# log_file /var/log/acm_\r
+ \r
+-log_file acm_\r
++log_file /var/log/acm_\r
+ \r
+ # log_level:\r
+ # Indicates the amount of detailed data written to the log file.  Log levels\r
+diff --git a/src/acme.c b/src/acme.c
+index 03e96ad..adf8d1f 100755
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -91,9 +91,9 @@ static void gen_opts_temp(FILE *f)
+       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, "\n");
+-      fprintf(f, "log_file acm_\n");
++      fprintf(f, "log_file /var/log/ibacm_\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 0ff8008..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,43 +0,0 @@
-Bottom: a9a7ff03d17186f855af81adb232170085e921d9
-Top:    771097925f08dc918e0aa61f53943911d30ccd0e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-28 16:38:15 -0700
-
-Refresh of log
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-old mode 100644
-new mode 100755
-index 95ac15a..3e3a4a0
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -15,9 +15,9 @@
- # Examples:\r
- # log_file stdout\r
- # log_file stderr\r
--# log_file /tmp/acm_\r
-+# log_file /var/log/acm_\r
- \r
--log_file acm_\r
-+log_file /var/log/acm_\r
- \r
- # log_level:\r
- # Indicates the amount of detailed data written to the log file.  Log levels\r
-diff --git a/src/acme.c b/src/acme.c
-index 03e96ad..adf8d1f 100755
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -91,9 +91,9 @@ static void gen_opts_temp(FILE *f)
-       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, "\n");
--      fprintf(f, "log_file acm_\n");
-+      fprintf(f, "log_file /var/log/ibacm_\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");