refresh (create temporary patch)

diff --git a/meta b/meta
index 716dad68421f797b494d8f41b9b92b913cb084d2..2cf6579ee41336bb31c5c15975b76f12783b6ad7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 0a261143c4421d646418199edda6c714c34d2a75
-Head: 526b1f53d85aecbcd55c299a1a7d606091494d3d
+Previous: 30007eec507cc191795ecc357c19c7f5b1bdd17f
+Head: b6b1567a8d2aae117fb33707c9db471e51bcbae2
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   daemonize: 526b1f53d85aecbcd55c299a1a7d606091494d3d
+  refresh-temp: b6b1567a8d2aae117fb33707c9db471e51bcbae2
 Unapplied:
   rel-1.0.6: 03aababda52a46ac0d6d4b670f76f44e298c6285
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e74d9bd
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,72 @@
+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");
+ }