refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..6c57596
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,69 @@
+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]);