refresh (create temporary patch)

diff --git a/meta b/meta
index 57c55edddbcaafc9dd8225b3e4bbd58489d95ce9..358d3f2f26ef546f6a07a16351e0a3aa6710cfe9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 494f4aabfa7007d2bceb499fa801f5e6519c5305
-Head: 4a9f7d6d6affdf1a8f9eee142c92aa06d37ceca9
+Previous: 998ef31f41a0ad8b3fcf59bf997d3923917afd88
+Head: 085c16438c5ebcbed141d25b493ce7b9d06085ee
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   daemonize: 4a9f7d6d6affdf1a8f9eee142c92aa06d37ceca9
+  refresh-temp: 085c16438c5ebcbed141d25b493ce7b9d06085ee
 Unapplied:
   rel-1.0.6: 8e4b688d3bd9e1229a0af043432b41e954292f74
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..42a3c45
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,56 @@
+Bottom: f1d60133c917c51b6a2e5412d02e961bac10d966
+Top:    bf622b57f0b0cd063ba351dea3e4eac4a8de301f
+Author: sean.hefty@intel.com <sean.hefty@intel.com>
+Date:   2012-04-02 17:24:06 -0700
+
+Refresh of daemonize
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 96a4514..d3d08b2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+-AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\"
++AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\"
+ 
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ibacm
+diff --git a/linux/osd.h b/linux/osd.h
+index 3c66761..c2360f3 100644
+--- a/linux/osd.h
++++ b/linux/osd.h
+@@ -48,6 +48,9 @@
+ #ifndef SYSCONFDIR\r
+ #define SYSCONFDIR "/etc/rdma"\r
+ #endif\r
++#ifndef BINDIR\r
++#define BINDIR "/usr/bin"\r
++#endif\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 39c0369..79b0976 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -205,6 +205,7 @@ 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 log_file[128] = "/var/log/ibacm.log";
+@@ -2508,7 +2509,7 @@ static FILE *acm_open_addr_file(void)
+               return f;
+ 
+       acm_log(0, "notice - generating %s file\n", addr_file);
+-      if (!(f = popen("ib_acme -A", "r"))) {
++      if (!(f = popen(acme, "r"))) {
+               acm_log(0, "ERROR - cannot generate %s\n", addr_file);
+               return NULL;
+       }