refresh (create temporary patch)

diff --git a/meta b/meta
index d8f78c68683628d2a9b87f42166c6eee887b22e8..46ef1cf9dbfc16aa2e01cf67307a1dc6053e2d2a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: d4054764a9751008c0a0a2f1608dd8d62a454208
-Head: 91182ecb1f98642631c73428866a556630e93f9a
+Previous: 9a936aa5c15080f633967e9495779b2ae2a09739
+Head: 394c529bdf34956d56da4b4650f3ed7eed1a8f37
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   daemonize: 91182ecb1f98642631c73428866a556630e93f9a
+  refresh-temp: 394c529bdf34956d56da4b4650f3ed7eed1a8f37
 Unapplied:
   rel-1.0.6: a256b7d7e603aaa09fda99ec9c0bf7d4968104fd
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..8b6c6ec
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,72 @@
+Bottom: 23b557b691cf74c5660ba20c705a0a41bc94de81
+Top:    b8fdd0200efe22a2cc85ef2b2f7837d307532809
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-04-02 15:43:07 -0700
+
+Refresh of daemonize
+
+---
+
+diff --git a/linux/osd.h b/linux/osd.h
+index 030f268..3c66761 100644
+--- a/linux/osd.h
++++ b/linux/osd.h
+@@ -46,9 +46,8 @@
+ #include <netinet/in.h>\r
+ \r
+ #ifndef SYSCONFDIR\r
+-#define SYSCONFDIR "/etc"\r
++#define SYSCONFDIR "/etc/rdma"\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 2a718b2..b992c8c 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 = ACM_DEST_DIR "/" ACM_OPTS_FILE;
+-static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;
++static char *opts_file = SYSCONFDIR "/" ACM_OPTS_FILE;
++static char *addr_file = SYSCONFDIR "/" 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", 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 43e6dd9..94ff710 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;
+ 
+@@ -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", ACM_DEST_DIR);
++      printf("                      (default is %s)\n", SYSCONFDIR);
+       printf("   -V               - enable verbose output\n");
+ }