refresh

diff --git a/meta b/meta
index 552032064cf484118e568989d2c15e9d6958e44d..26ce17f88c9dec232845de76f04cd1cda2552e96 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: cb4f568eec25dd3207cb4b232fa428cabf13b35c
-Head: 2d0af867540f4a54a179f652974b153525c32e4d
+Previous: ba05c113b1f8ad7d0e08886afd78411659f064a2
+Head: 4f7ae895e5b80c367279bc94ee532d53db4cd0db
 Applied:
   daemon: 32ca7dbd7bb04dabb504faa3ffe319e5f965d716
   cfg: 91fd5f444591ae8691a5bcf155467d0e7c493963
-  log: bbc172e91a4ccbed11dd0b33cb753aafdb6675f5
-  refresh-temp: 2d0af867540f4a54a179f652974b153525c32e4d
+  log: 4f7ae895e5b80c367279bc94ee532d53db4cd0db
 Unapplied:
 Hidden:

diff --git a/patches/log b/patches/log
index 0cd4998196c4bb40c3a00913aaa22cf85a3ae626..105a93d5520d98d4a8aa5f7704b8ad2eb7927722 100644 (file)
--- a/patches/log
+++ b/patches/log
@@ -1,5 +1,5 @@
 Bottom: 3d9238d760c3f6458939674d7c9d6e3cd9ccd553
-Top:    39bbbf5da98d41d0c4b43dabfd6ed1b5b0183435
+Top:    8d9d24a7b5bdfb3bfcf14bcd32fd20a7b0899eaf
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-28 16:35:30 -0700
 
@@ -13,21 +13,49 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 95ac15a..52a362f 100644
+index 95ac15a..3dbb0c6 100644
 --- a/acm_opts.cfg
 +++ b/acm_opts.cfg
-@@ -15,9 +15,9 @@
+@@ -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_\r
++# log_file /var/log/ibacm.log\r
  \r
 -log_file acm_\r
-+log_file /var/log/ibacm_\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..adf8d1f 100644
 --- a/src/acme.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 80467f0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,52 +0,0 @@
-Bottom: 39bbbf5da98d41d0c4b43dabfd6ed1b5b0183435
-Top:    8d9d24a7b5bdfb3bfcf14bcd32fd20a7b0899eaf
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-29 10:45:29 -0700
-
-Refresh of log
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 52a362f..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 /var/log/ibacm_\r
-+# log_file /var/log/ibacm.log\r
- \r
--log_file /var/log/ibacm_\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;