refresh

diff --git a/meta b/meta
index dc0b752247b6779f41cb80703c9d431411610b9f..363757a01f58c093602060cd903218046998bfa3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 68e92c59ad194752aaa9c359f00b2e53db0ff66e
-Head: 56251672a6360e7a5dff4d9ac119f25ada107585
+Previous: 67ead189c6beaec593ef0e1bf859e993273449b9
+Head: fd0081e6f0b58e667a55375cf8baf158ed289f3b
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 4bcc8d3c74a2f12c5e379a6e3892dbbc6b1630d0
-  refresh-temp: 56251672a6360e7a5dff4d9ac119f25ada107585
+  daemonize: fd0081e6f0b58e667a55375cf8baf158ed289f3b
 Unapplied:
   rel-1.0.6: 3fee15de075341b73c8cef8f92f494fc35a029b5
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 2744a29d4efc0491ab674f8b806215e9a36a4097..0e5264e36577f40b28ddfb897853e653264c6429 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    bf622b57f0b0cd063ba351dea3e4eac4a8de301f
+Top:    9ffb8a216b16c5f36346ed4e2eb20700dd457bd9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -547,7 +547,7 @@ index f26ffb8..c0c63fc 100644
 -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..79b0976 100644
+index 906c926..82436e6 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER];
@@ -556,7 +556,7 @@ index 906c926..79b0976 100644
   */
 -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 *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";

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1837946..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: bf622b57f0b0cd063ba351dea3e4eac4a8de301f
-Top:    9ffb8a216b16c5f36346ed4e2eb20700dd457bd9
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-02 17:26:15 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 79b0976..82436e6 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -205,7 +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 *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";