Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top: c75a63ed35d19ebbd46f0db013a471d4c891ecae
+Top: 23b557b691cf74c5660ba20c705a0a41bc94de81
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-03-30 16:31:08 -0700
rename from acm_opts.cfg
rename to ibacm_opts.cfg
diff --git a/linux/osd.h b/linux/osd.h
-index 33ea842..943b719 100644
+index 33ea842..030f268 100644
--- a/linux/osd.h
+++ b/linux/osd.h
-@@ -45,9 +45,11 @@
+@@ -45,9 +45,12 @@
#include <sys/time.h>\r
#include <netinet/in.h>\r
\r
-#define ACM_ADDR_FILE "acm_addr.cfg"\r
-#define ACM_OPTS_FILE "acm_opts.cfg"\r
+#ifndef SYSCONFDIR\r
-+#define SYSCONFDIR "\etc\rdma"\r
++#define SYSCONFDIR "/etc"\r
+#endif\r
++#define ACM_DEST_DIR SYSCONFDIR "/rdma"\r
+#define ACM_ADDR_FILE "ibacm_addr.cfg"\r
+#define ACM_OPTS_FILE "ibacm_opts.cfg"\r
\r
-ib_acme(1), ib_acm(1)\r
+ib_acme(1), ibacm(1)\r
diff --git a/src/acm.c b/src/acm.c
-index 906c926..b992c8c 100644
+index 906c926..2a718b2 100644
--- a/src/acm.c
+++ b/src/acm.c
@@ -205,11 +205,11 @@ static atomic_t counter[ACM_MAX_COUNTER];
*/
-static char *opts_file = "/etc/ibacm/acm_opts.cfg";
-static char *addr_file = "/etc/ibacm/acm_addr.cfg";
-+static char *opts_file = SYSCONFDIR "/" ACM_OPTS_FILE;
-+static char *addr_file = SYSCONFDIR "/" ACM_ADDR_FILE;
++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";
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;
-@@ -3156,9 +3156,9 @@ static void show_usage(char *program)
- printf(" [-D] - run as a daemon (default)\n");
- printf(" [-P] - run as a standard process\n");
- printf(" [-A addr_file] - address configuration file\n");
-- printf(" (default %s/%s\n", ACM_DEST_DIR, ACM_ADDR_FILE);
-+ printf(" (default %s/%s\n", SYSCONFDIR, ACM_ADDR_FILE);
- printf(" [-O option_file] - option configuration file\n");
-- printf(" (default %s/%s\n", ACM_DEST_DIR, ACM_OPTS_FILE);
-+ printf(" (default %s/%s\n", SYSCONFDIR, ACM_OPTS_FILE);
- }
-
- int CDECL_FUNC main(int argc, char **argv)
diff --git a/src/acme.c b/src/acme.c
-index 3d7461b..94ff710 100644
+index 3d7461b..43e6dd9 100644
--- a/src/acme.c
+++ b/src/acme.c
-@@ -43,7 +43,7 @@
- #include <infiniband/acm.h>
- #include "libacm.h"
-
--static char *dest_dir = ACM_DEST_DIR;
-+static char *dest_dir = SYSCONFDIR;
- static char *addr_file = ACM_ADDR_FILE;
- static char *opts_file = ACM_OPTS_FILE;
-
@@ -69,7 +69,7 @@ extern char **parse(char *args, int *count);
static void show_usage(char *program)
{
printf(" [-f addr_format] - i(p), n(ame), l(id), g(gid), or u(nspecified)\n");
printf(" address format for -s and -d options, default: 'u'\n");
printf(" [-s src_addr] - source address for path queries\n");
-@@ -79,13 +79,13 @@ static void show_usage(char *program)
+@@ -79,10 +79,10 @@ static void show_usage(char *program)
printf(" [-P] - query performance data from destination service\n");
printf(" [-S svc_addr] - address of ACM service, default: local service\n");
printf("usage 2: %s\n", program);
+ printf(" -O [opt_file] - generate local ibacm_opts.cfg options file\n");
printf(" (default is %s)\n", ACM_OPTS_FILE);
printf(" -D dest_dir - specify destination directory for output files\n");
-- printf(" (default is %s)\n", ACM_DEST_DIR);
-+ printf(" (default is %s)\n", SYSCONFDIR);
- printf(" -V - enable verbose output\n");
- }
-
+ printf(" (default is %s)\n", ACM_DEST_DIR);
@@ -94,7 +94,7 @@ static void gen_opts_temp(FILE *f)
fprintf(f, "# InfiniBand Multicast Communication Manager for clusters configuration file\n");
fprintf(f, "#\n");
+++ /dev/null
-Bottom: c75a63ed35d19ebbd46f0db013a471d4c891ecae
-Top: 23b557b691cf74c5660ba20c705a0a41bc94de81
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-04-02 15:30:10 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/linux/osd.h b/linux/osd.h
-index 943b719..030f268 100644
---- a/linux/osd.h
-+++ b/linux/osd.h
-@@ -46,8 +46,9 @@
- #include <netinet/in.h>\r
- \r
- #ifndef SYSCONFDIR\r
--#define SYSCONFDIR "\etc\rdma"\r
-+#define SYSCONFDIR "/etc"\r
- #endif\r
-+#define ACM_DEST_DIR SYSCONFDIR "/rdma"\r
- #define ACM_ADDR_FILE "ibacm_addr.cfg"\r
- #define ACM_OPTS_FILE "ibacm_opts.cfg"\r
- \r
-diff --git a/src/acm.c b/src/acm.c
-index b992c8c..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 = SYSCONFDIR "/" ACM_OPTS_FILE;
--static char *addr_file = SYSCONFDIR "/" ACM_ADDR_FILE;
-+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";
-@@ -3156,9 +3156,9 @@ static void show_usage(char *program)
- printf(" [-D] - run as a daemon (default)\n");
- printf(" [-P] - run as a standard process\n");
- printf(" [-A addr_file] - address configuration file\n");
-- printf(" (default %s/%s\n", SYSCONFDIR, ACM_ADDR_FILE);
-+ printf(" (default %s/%s\n", ACM_DEST_DIR, ACM_ADDR_FILE);
- printf(" [-O option_file] - option configuration file\n");
-- printf(" (default %s/%s\n", SYSCONFDIR, ACM_OPTS_FILE);
-+ printf(" (default %s/%s\n", ACM_DEST_DIR, ACM_OPTS_FILE);
- }
-
- int CDECL_FUNC main(int argc, char **argv)
-diff --git a/src/acme.c b/src/acme.c
-index 94ff710..43e6dd9 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -43,7 +43,7 @@
- #include <infiniband/acm.h>
- #include "libacm.h"
-
--static char *dest_dir = SYSCONFDIR;
-+static char *dest_dir = ACM_DEST_DIR;
- static char *addr_file = ACM_ADDR_FILE;
- static char *opts_file = ACM_OPTS_FILE;
-
-@@ -85,7 +85,7 @@ static void show_usage(char *program)
- printf(" -O [opt_file] - generate local ibacm_opts.cfg options file\n");
- printf(" (default is %s)\n", ACM_OPTS_FILE);
- printf(" -D dest_dir - specify destination directory for output files\n");
-- printf(" (default is %s)\n", SYSCONFDIR);
-+ printf(" (default is %s)\n", ACM_DEST_DIR);
- printf(" -V - enable verbose output\n");
- }