Refresh of daemonize

diff --git a/linux/osd.h b/linux/osd.h
index 943b7196e9149b3861ca093fe2de26d587127c55..030f26822540379af0377494309d881396a623ad 100644 (file)
--- 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 b992c8cb94cab33e1f0da647e69418595886ed95..2a718b293209d32a43061d506a8c47b3e1a30790 100644 (file)
--- 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 94ff710731a6a35d0bf2f447fdac188cf916392e..43e6dd95c0f6d9fa646532c8a26e7e9a18e759b8 100644 (file)
--- 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");
 }