]> git.openfabrics.org - ~shefty/ibacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Wed, 8 Dec 2010 19:57:33 +0000 (11:57 -0800)
committerSean Hefty <sean.hefty@intel.com>
Wed, 8 Dec 2010 19:57:33 +0000 (11:57 -0800)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 8c43c543981907e74ed4604b60ec112717ce1fb6..3461449c45527e88c303d91f3a34c5f3d094f3bb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 548d45a28e425c05009663ab52d957439c2a3d04
-Head: fdb0bf40c51be7713f7cf670de0974071bdcbabb
+Previous: 040e08128b25822f83e29162423228176fdc7fe6
+Head: 1863ae8a205413d1b01526d3e9ed5df85485539f
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,6 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: fdb0bf40c51be7713f7cf670de0974071bdcbabb
+  refresh-temp: 1863ae8a205413d1b01526d3e9ed5df85485539f
 Unapplied:
   verbose: 7d3eb666f178578cfd1b9538dfe0a1837212af34
   dbg_1: 7f1fde0fec539348e38ef7c41b2548cc3613ab4a
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..de2515f
--- /dev/null
@@ -0,0 +1,22 @@
+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;