refresh

diff --git a/meta b/meta
index 99a88cfe8532f254d9fd772de9329e039d00e9fa..27a530a5f6fd90c09910a630c62e91141612c4aa 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 114a1d2d3d0c8d21e451f77b1e597264813426f3
-Head: 3894377b67f2d0f15fd81be3df44730adf917fe9
+Previous: 77165fc5826af2c3f1b6b35e10edb6782a3944eb
+Head: a5b14c80b36a4e5b10f076d73383c9b66876c989
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -19,8 +19,7 @@ Applied:
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
   addrinfo: ea78077f0d4a7c2bb513531fac18f03573578b3c
   notes_man: 77cdfebd3c888052e7dd752f0191dfca26a2d137
-  def_log: 144553784be42bdce4a039e2ea9bfa9e453ebbfe
-  refresh-temp: 3894377b67f2d0f15fd81be3df44730adf917fe9
+  def_log: a5b14c80b36a4e5b10f076d73383c9b66876c989
 Unapplied:
   1.0.4: 8bd14400a546cabd3c62d8e190b9957dcbe0702e
 Hidden:

diff --git a/patches/def_log b/patches/def_log
index d64463e9c5247ec3c5cc7e835af1e126fb6284fd..1185a269cb2146355317a41425a2419f7ce97ace 100644 (file)
--- a/patches/def_log
+++ b/patches/def_log
@@ -1,5 +1,5 @@
 Bottom: ed3b4c384899490638369a7bde63f5f7484e691b
-Top:    ed3b4c384899490638369a7bde63f5f7484e691b
+Top:    74a2df92df8183f35eb98e47ce0facf8b6db2d63
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-08 11:34:36 -0800
 
@@ -14,4 +14,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 0a9c1c9..1e20325 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -209,7 +209,7 @@ PER_THREAD char log_data[ACM_MAX_ADDRESS];
+ 
+ static char *opts_file = "/etc/ibacm/acm_opts.cfg";
+ static char *addr_file = "/etc/ibacm/acm_addr.cfg";
+-static char log_file[128] = "stdout";
++static char log_file[128] = "/var/log/ibacm.log";
+ static int log_level = 0;
+ static char lock_file[128] = "/var/log/ibacm.pid";
+ static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2542c05..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: ed3b4c384899490638369a7bde63f5f7484e691b
-Top:    74a2df92df8183f35eb98e47ce0facf8b6db2d63
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-08 11:35:03 -0800
-
-Refresh of def_log
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 0a9c1c9..1e20325 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -209,7 +209,7 @@ PER_THREAD char log_data[ACM_MAX_ADDRESS];
- 
- static char *opts_file = "/etc/ibacm/acm_opts.cfg";
- static char *addr_file = "/etc/ibacm/acm_addr.cfg";
--static char log_file[128] = "stdout";
-+static char log_file[128] = "/var/log/ibacm.log";
- static int log_level = 0;
- static char lock_file[128] = "/var/log/ibacm.pid";
- static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;