refresh

diff --git a/meta b/meta
index 37ed4a0b323bc9bbb50424c8b6bf78c50993b467..43da62420a41f4f69ddfa0c4e0a4f7bee4edbc3f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 307b23fd5d63c26aec5fe37dee474c756bf07a21
-Head: e4b37b027a28c8dd2b475c55913e71730d683044
+Previous: a1560b29ccb2694cff12817eea03c9fa773c6183
+Head: 19447bec1a6b2cae7f27654010530f95403c2239
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
-  file-loc: 6f7d102e3fb3979264e5de301035e647df6f0373
-  refresh-temp: e4b37b027a28c8dd2b475c55913e71730d683044
+  file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
 Unapplied:
   init-script: f27b20c5573a044b631b46d8750f97b8fc7cb836
   fixup-man: 3b3d0caee4b583c2853c12c6728dbfac03d544f9

diff --git a/patches/file-loc b/patches/file-loc
index 31a6f19e98c7ca113581b12f5b91c9e586af4018..5cdd2d3581830be51c760a07f4b699d8b3d88d66 100644 (file)
--- a/patches/file-loc
+++ b/patches/file-loc
@@ -1,5 +1,5 @@
 Bottom: b7ef43780109283b77986862aa8504222eb78bce
-Top:    80a25ead5e5cb7d2944f448fe3bd29145d9aaf0f
+Top:    f12645dfa0a12d7006a65beabc21e55ad5dd4037
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:29:46 -0700
 
@@ -31,7 +31,7 @@ index 33ea842..f085a58 100644
  #define LIB_DESTRUCTOR __attribute__((destructor))\r
  #define CDECL_FUNC\r
 diff --git a/src/acm.c b/src/acm.c
-index 906c926..f0c33d4 100644
+index 906c926..2a718b2 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -205,11 +205,11 @@ static atomic_t counter[ACM_MAX_COUNTER];
@@ -40,8 +40,8 @@ index 906c926..f0c33d4 100644
   */
 -static char *opts_file = "/etc/ibacm/acm_opts.cfg";
 -static char *addr_file = "/etc/ibacm/acm_addr.cfg";
-+static char *opts_file = ACM_DEST_DIR "/" ACM_OPTS_FILE;//"/etc/rdma/ibacm_opts.cfg";
-+static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;//"/etc/rdma/ibacm_addr.cfg";
++static char *opts_file = ACM_DEST_DIR "/" ACM_OPTS_FILE;
++static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;
  static char log_file[128] = "/var/log/ibacm.log";
  static int log_level = 0;
 -static char lock_file[128] = "/var/lock/ibacm.pid";

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a0783df..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 80a25ead5e5cb7d2944f448fe3bd29145d9aaf0f
-Top:    f12645dfa0a12d7006a65beabc21e55ad5dd4037
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 11:11:31 -0700
-
-Refresh of file-loc
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index f0c33d4..2a718b2 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -205,8 +205,8 @@ static atomic_t counter[ACM_MAX_COUNTER];
- /*
-  * Service options - may be set through acm_opts file.
-  */
--static char *opts_file = ACM_DEST_DIR "/" ACM_OPTS_FILE;//"/etc/rdma/ibacm_opts.cfg";
--static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;//"/etc/rdma/ibacm_addr.cfg";
-+static char *opts_file = ACM_DEST_DIR "/" ACM_OPTS_FILE;
-+static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;
- static char log_file[128] = "/var/log/ibacm.log";
- static int log_level = 0;
- static char lock_file[128] = "/var/run/ibacm.pid";