refresh

diff --git a/meta b/meta
index a64cf2bf4ad1c9e6d1b758630760f43d71dd6067..e4afac571602a74f13b2e6e6012be72e9e35c53f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8e52fe43eea1d87bcd650269050b8107e1d6a497
-Head: 539c42b895da7adea8ba057324814e61ec4c94e8
+Previous: c804fa04b20c16d8d4b208d7de290fb124f6541d
+Head: 40e4f86ae3897a335dc63c358e29a98480bed111
 Applied:
   daemon: d181ac6bc8261d6f0fe4935d2035e0beff560bd9
-  cfg: f82dfae0f15850f605465511fc8458799f32bb17
-  refresh-temp: 539c42b895da7adea8ba057324814e61ec4c94e8
+  cfg: 40e4f86ae3897a335dc63c358e29a98480bed111
 Unapplied:
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index d144e169eb8e159c6c67d23eee913f84e3d9ae2a..9115ea22c5f2e573569d2fe97edecc9dd8dc968b 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
 Bottom: c0b0b9437af8a63e1983d07068459108d805ce35
-Top:    78874173621b61fde50fac313009679ef66af15c
+Top:    ce84fc8f9ffa7720dac563afffa748f944088dfb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -16,15 +16,15 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 2b1e1fd..0e6908e 100755
+index 2b1e1fd..53499f9 100755
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -191,6 +191,8 @@ static struct acm_client client[FD_SETSIZE - 1];
  static FILE *flog;
  static lock_t log_lock;
  
-+static char *opts_file = "\\etc\\ibacm\\acm_opts.cfg"
-+static char *addr_file = "\\etc\\ibacm\\acm_addr.cfg"
++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 enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
@@ -41,16 +41,35 @@ index 2b1e1fd..0e6908e 100755
  }
  
  int CDECL_FUNC main(int argc, char **argv)
+@@ -2647,11 +2653,17 @@ int CDECL_FUNC main(int argc, char **argv)
+       int dev_cnt;
+       int op, i, daemon = 0;
+ 
+-      while ((op = getopt(argc, argv, "D")) != -1) {
++      while ((op = getopt(argc, argv, "DA:O:")) != -1) {
+               switch (op) {
+               case 'D':
+                       daemon = 1;
+                       break;
++              case 'A':
++                      addr_file = optarg;
++                      break;
++              case 'O':
++                      opts_file = optarg;
++                      break;
+               default:
+                       show_usage(argv[0]);
+                       exit(1);
 diff --git a/src/acme.c b/src/acme.c
-index 5a5a09a..85d4ada 100644
+index 5a5a09a..6ec472f 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -39,6 +39,8 @@
  #include <infiniband/acm.h>
  #include "libacm.h"
  
-+static char opts_file[100] = "//etc//ibacm//acm_opts.cfg";
-+static char addr_file[100] = "//etc//ibacm//acm_addr.cfg";
++static char opts_file[100] = "/etc/ibacm/acm_opts.cfg";
++static char addr_file[100] = "/etc/ibacm/acm_addr.cfg";
  static char *dest_addr;
  static char *src_addr;
  static char addr_type = 'i';
@@ -95,8 +114,8 @@ index 5a5a09a..85d4ada 100644
                        make_opts = 1;
                        break;
 +              case 'D':
-+                      snprintf(opts_file, "%s//acm_opts.cfg", 80, optarg);
-+                      snprintf(addr_file, "%s//acm_addr.cfg", 80, optarg);
++                      snprintf(opts_file, "%s/acm_opts.cfg", 80, optarg);
++                      snprintf(addr_file, "%s/acm_addr.cfg", 80, optarg);
 +                      break;
                default:
                        show_usage(argv[0]);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6c57596..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,69 +0,0 @@
-Bottom: 78874173621b61fde50fac313009679ef66af15c
-Top:    ce84fc8f9ffa7720dac563afffa748f944088dfb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-23 17:58:17 -0700
-
-Refresh of cfg
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 0e6908e..53499f9 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -191,8 +191,8 @@ static struct acm_client client[FD_SETSIZE - 1];
- static FILE *flog;
- static lock_t log_lock;
- 
--static char *opts_file = "\\etc\\ibacm\\acm_opts.cfg"
--static char *addr_file = "\\etc\\ibacm\\acm_addr.cfg"
-+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 enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
-@@ -2653,11 +2653,17 @@ int CDECL_FUNC main(int argc, char **argv)
-       int dev_cnt;
-       int op, i, daemon = 0;
- 
--      while ((op = getopt(argc, argv, "D")) != -1) {
-+      while ((op = getopt(argc, argv, "DA:O:")) != -1) {
-               switch (op) {
-               case 'D':
-                       daemon = 1;
-                       break;
-+              case 'A':
-+                      addr_file = optarg;
-+                      break;
-+              case 'O':
-+                      opts_file = optarg;
-+                      break;
-               default:
-                       show_usage(argv[0]);
-                       exit(1);
-diff --git a/src/acme.c b/src/acme.c
-index 85d4ada..6ec472f 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -39,8 +39,8 @@
- #include <infiniband/acm.h>
- #include "libacm.h"
- 
--static char opts_file[100] = "//etc//ibacm//acm_opts.cfg";
--static char addr_file[100] = "//etc//ibacm//acm_addr.cfg";
-+static char opts_file[100] = "/etc/ibacm/acm_opts.cfg";
-+static char addr_file[100] = "/etc/ibacm/acm_addr.cfg";
- static char *dest_addr;
- static char *src_addr;
- static char addr_type = 'i';
-@@ -526,8 +526,8 @@ int CDECL_FUNC main(int argc, char **argv)
-                       make_opts = 1;
-                       break;
-               case 'D':
--                      snprintf(opts_file, "%s//acm_opts.cfg", 80, optarg);
--                      snprintf(addr_file, "%s//acm_addr.cfg", 80, optarg);
-+                      snprintf(opts_file, "%s/acm_opts.cfg", 80, optarg);
-+                      snprintf(addr_file, "%s/acm_addr.cfg", 80, optarg);
-                       break;
-               default:
-                       show_usage(argv[0]);