refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..80467f0
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,52 @@
+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;