refresh

diff --git a/meta b/meta
index 3461449c45527e88c303d91f3a34c5f3d094f3bb..87e24abb433042041cbfe5e4d3170a7c940985f2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 040e08128b25822f83e29162423228176fdc7fe6
-Head: 1863ae8a205413d1b01526d3e9ed5df85485539f
+Previous: 95c4cd5cb9f20825fcc195516db2256b87712ea4
+Head: 60eb7f20f1d4835c0004988322089722ea49338b
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -8,8 +8,7 @@ Applied:
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
-  locking: fdb0bf40c51be7713f7cf670de0974071bdcbabb
-  refresh-temp: 1863ae8a205413d1b01526d3e9ed5df85485539f
+  locking: 60eb7f20f1d4835c0004988322089722ea49338b
 Unapplied:
   verbose: 7d3eb666f178578cfd1b9538dfe0a1837212af34
   dbg_1: 7f1fde0fec539348e38ef7c41b2548cc3613ab4a

diff --git a/patches/locking b/patches/locking
index ca943a02e4ab314099b6c17be8e951321d98fe2a..b98f908fa8359f9b530aecdf67f14e9e026bb4c8 100644 (file)
--- a/patches/locking
+++ b/patches/locking
@@ -1,5 +1,5 @@
 Bottom: 1ac64e1267b46288459f8b4a25aeb893b3d48cba
-Top:    b4a0745eb9fbe073654d6057445a51e490d3711d
+Top:    517dae237c64bc280892803e33e19d8e9a7b1c5a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-02 14:12:56 -0800
 
@@ -31,7 +31,7 @@ index 372cd7b..7147fe2 100644
  # Default resolution protocol to resolve IP addresses into IB GIDs.\r
  # Supported protocols are:\r
 diff --git a/src/acm.c b/src/acm.c
-index 3152392..bda18b5 100644
+index 3152392..bc7124f 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -36,8 +36,10 @@
@@ -49,7 +49,7 @@ index 3152392..bda18b5 100644
  static char *addr_file = "/etc/ibacm/acm_addr.cfg";
  static char log_file[128] = "stdout";
  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;
  static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
  static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index de2515f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: b4a0745eb9fbe073654d6057445a51e490d3711d
-Top:    517dae237c64bc280892803e33e19d8e9a7b1c5a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-08 11:57:32 -0800
-
-Refresh of locking
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index bda18b5..bc7124f 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -210,7 +210,7 @@ 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 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;
- static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
- static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;