pop

diff --git a/meta b/meta
index 10712286d984f956ac8ab2a63672c98af874bd14..b8b35de06283fed8d45c0a5911a574fbb4be74e1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e754e6ef8e1451b9ac7246a6e19b5d799c3f15b5
-Head: 9391e2c128b78454a10f0d084259462c3be2fdf2
+Previous: 5244744616763fab186897b8acb1c85189f18035
+Head: 6a873fb9e849e52406445250258ee12a2042798b
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -19,7 +19,7 @@ Applied:
   mult_dest: d31a059034ae040e043546f0823355c0fcfc340e
   addrinfo: f788ab072e90d0d2165e59d05ceebbe34c0d959b
   notes_man: 9391e2c128b78454a10f0d084259462c3be2fdf2
+  def_log: 6a873fb9e849e52406445250258ee12a2042798b
 Unapplied:
-  def_log: 4df93d77448b4a1729f2c7ff4ccd5a5cfcec2492
   1.0.4: 8bd14400a546cabd3c62d8e190b9957dcbe0702e
 Hidden:

diff --git a/patches/def_log b/patches/def_log
index ef90a1a0572d2bd973a0945f0110476c80fe273f..b5860655a9d615d5909c22a5cbf6181aeb7ccf5c 100644 (file)
--- a/patches/def_log
+++ b/patches/def_log
@@ -1,5 +1,5 @@
-Bottom: 87c5368e2f4e4c46ffd6be7d4d714bc7619f0c38
-Top:    6df2a5f7fa6ccb0df12b114a389e8b39b9b0dc36
+Bottom: 78b61bf7bb586d32032d116f42400095bee14790
+Top:    73282e0f0d61bd4c4fc726f5436d4d479aa5ac42
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-08 11:34:36 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index ed6ce74..757871e 100644
+index 08f233c..67c4925 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -209,7 +209,7 @@ PER_THREAD char log_data[ACM_MAX_ADDRESS];
@@ -25,5 +25,5 @@ index ed6ce74..757871e 100644
 -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 char lock_file[128] = "/var/lock/ibacm.pid";
  static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;