Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top: 56f2c285e9a48bd5f17f10c897f8f459b10cd403
+Top: 5845b20997dda75dd9baf21235ec37582f2e3321
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-03-30 16:31:08 -0700
---
diff --git a/Makefile.am b/Makefile.am
-index 503ad72..4ede5ae 100644
+index 503ad72..58e3415 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
util_ib_acme_CFLAGS = $(AM_CFLAGS)
ibacmincludedir = $(includedir)/infiniband
-@@ -15,12 +15,21 @@ ibacminclude_HEADERS = include/infiniband/acm.h
+@@ -15,12 +15,24 @@ ibacminclude_HEADERS = include/infiniband/acm.h
man_MANS = \
man/ib_acme.1 \
+ if ! test -d $(DESTDIR)$(sysconfdir); then \
+ mkdir -p $(DESTDIR)$(sysconfdir); \
+ fi; \
++ if ! test -d $(DESTDIR)$(sysconfdir)/rdma; then \
++ mkdir -p $(DESTDIR)$(sysconfdir)/rdma; \
++ fi; \
+ if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \
+ mkdir -p $(DESTDIR)$(sysconfdir)/init.d; \
+ fi; \
rename from acm_opts.cfg
rename to ibacm_opts.cfg
diff --git a/linux/osd.h b/linux/osd.h
-index 33ea842..c2360f3 100644
+index 33ea842..169e041 100644
--- a/linux/osd.h
+++ b/linux/osd.h
-@@ -45,9 +45,14 @@
+@@ -45,9 +45,15 @@
#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
+#ifndef BINDIR\r
+#define BINDIR "/usr/bin"\r
+#endif\r
++#define ACM_CONF_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..82436e6 100644
+index 906c926..4e90e8c 100644
--- a/src/acm.c
+++ b/src/acm.c
@@ -205,11 +205,12 @@ 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 *acme = BINDIR "/ib_acme -A";
-+static char *opts_file = SYSCONFDIR "/" ACM_OPTS_FILE;
-+static char *addr_file = SYSCONFDIR "/" ACM_ADDR_FILE;
++static char *opts_file = ACM_CONF_DIR "/" ACM_OPTS_FILE;
++static char *addr_file = ACM_CONF_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";
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(" (default %s/%s\n", ACM_CONF_DIR, 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);
++ printf(" (default %s/%s\n", ACM_CONF_DIR, 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..5bc6461 100644
--- a/src/acme.c
+++ b/src/acme.c
@@ -43,7 +43,7 @@
#include "libacm.h"
-static char *dest_dir = ACM_DEST_DIR;
-+static char *dest_dir = SYSCONFDIR;
++static char *dest_dir = ACM_CONF_DIR;
static char *addr_file = ACM_ADDR_FILE;
static char *opts_file = ACM_OPTS_FILE;
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(" (default is %s)\n", ACM_CONF_DIR);
printf(" -V - enable verbose output\n");
}
+++ /dev/null
-Bottom: 56f2c285e9a48bd5f17f10c897f8f459b10cd403
-Top: 5845b20997dda75dd9baf21235ec37582f2e3321
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date: 2012-04-03 11:38:12 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 4ede5ae..58e3415 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,6 +26,9 @@ install-exec-hook:
- if ! test -d $(DESTDIR)$(sysconfdir); then \
- mkdir -p $(DESTDIR)$(sysconfdir); \
- fi; \
-+ if ! test -d $(DESTDIR)$(sysconfdir)/rdma; then \
-+ mkdir -p $(DESTDIR)$(sysconfdir)/rdma; \
-+ fi; \
- if ! test -d $(DESTDIR)$(sysconfdir)/init.d; then \
- mkdir -p $(DESTDIR)$(sysconfdir)/init.d; \
- fi; \
-diff --git a/linux/osd.h b/linux/osd.h
-index c2360f3..169e041 100644
---- a/linux/osd.h
-+++ b/linux/osd.h
-@@ -46,11 +46,12 @@
- #include <netinet/in.h>\r
- \r
- #ifndef SYSCONFDIR\r
--#define SYSCONFDIR "/etc/rdma"\r
-+#define SYSCONFDIR "/etc"\r
- #endif\r
- #ifndef BINDIR\r
- #define BINDIR "/usr/bin"\r
- #endif\r
-+#define ACM_CONF_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 82436e6..4e90e8c 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -206,8 +206,8 @@ static atomic_t counter[ACM_MAX_COUNTER];
- * Service options - may be set through acm_opts file.
- */
- static char *acme = BINDIR "/ib_acme -A";
--static char *opts_file = SYSCONFDIR "/" ACM_OPTS_FILE;
--static char *addr_file = SYSCONFDIR "/" ACM_ADDR_FILE;
-+static char *opts_file = ACM_CONF_DIR "/" ACM_OPTS_FILE;
-+static char *addr_file = ACM_CONF_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";
-@@ -3157,9 +3157,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_CONF_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_CONF_DIR, ACM_OPTS_FILE);
- }
-
- int CDECL_FUNC main(int argc, char **argv)
-diff --git a/src/acme.c b/src/acme.c
-index 94ff710..5bc6461 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_CONF_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_CONF_DIR);
- printf(" -V - enable verbose output\n");
- }