]> git.openfabrics.org - ~shefty/ibacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Sat, 24 Jul 2010 00:55:40 +0000 (17:55 -0700)
committerSean Hefty <sean.hefty@intel.com>
Sat, 24 Jul 2010 00:55:40 +0000 (17:55 -0700)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 4ee7e11344c193a914804460d5f80b7d8ba28b3d..88219d6f9ec4e05832af44e1e4fa83c804621f3e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 050012e8162dd545015057221c7fbec0db092e13
-Head: 187f7592a2601543da8cf16720e65aeffc0854d9
+Previous: a0d197592405e44a548533a1aa3c12141d52247f
+Head: a035f118c0c96f62558f7ca21ac0c8d4d5264a1d
 Applied:
   daemon: d181ac6bc8261d6f0fe4935d2035e0beff560bd9
   cfg: 187f7592a2601543da8cf16720e65aeffc0854d9
+  refresh-temp: a035f118c0c96f62558f7ca21ac0c8d4d5264a1d
 Unapplied:
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..f5ac5f9
--- /dev/null
@@ -0,0 +1,35 @@
+Bottom: baef440c67372b788a01e6058d5eaf74beb5be46
+Top:    78874173621b61fde50fac313009679ef66af15c
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-07-23 17:55:40 -0700
+
+Refresh of cfg
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 2b1e1fd..0e6908e 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 log_file[128] = "stdout";
+ static int log_level = 0;
+ static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
+@@ -2638,7 +2640,11 @@ static void daemonize(void)
+ static void show_usage(char *program)
+ {
+       printf("usage: %s\n", program);
+-      printf("   [-D] - run as a daemon\n");
++      printf("   [-D]             - run as a daemon\n");
++      printf("   [-A addr_file]   - address configuration file\n");
++      printf("                      (default /etc/ibacm/acm_addr.cfg\n");
++      printf("   [-O option_file] - option configuration file\n");
++      printf("                      (default /etc/ibacm/acm_opts.cfg\n");
+ }
+ int CDECL_FUNC main(int argc, char **argv)