refresh

diff --git a/meta b/meta
index 57bea19a297a07dd545f68cf283243e94ac71a45..57c55edddbcaafc9dd8225b3e4bbd58489d95ce9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: f1300e252bf6692826157a69f9b01b1b1730ac39
-Head: 40d16407ad3858d028fdfd2e3f9a794f9c1652c6
+Previous: 494f4aabfa7007d2bceb499fa801f5e6519c5305
+Head: 4a9f7d6d6affdf1a8f9eee142c92aa06d37ceca9
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 4a33f2b2b8ecf8b0ee0b1f9c5acb68415553dd33
-  refresh-temp: 40d16407ad3858d028fdfd2e3f9a794f9c1652c6
+  daemonize: 4a9f7d6d6affdf1a8f9eee142c92aa06d37ceca9
 Unapplied:
   rel-1.0.6: 8e4b688d3bd9e1229a0af043432b41e954292f74
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 582856731b6fb1b6566a9e4ae0cbf3a0aa7f2a78..bd22242f6f05519e3724b9478f5da5b9271f2a36 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    02e5cbc02d439de21ba3946ef1fc7c3a2d591b2c
+Top:    f1d60133c917c51b6a2e5412d02e961bac10d966
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -544,7 +544,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..b992c8c 100644
+index 906c926..39c0369 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -205,11 +205,11 @@ static atomic_t counter[ACM_MAX_COUNTER];
@@ -562,6 +562,18 @@ index 906c926..b992c8c 100644
  static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
  static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
  static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
+@@ -2507,9 +2507,9 @@ static FILE *acm_open_addr_file(void)
+       if ((f = fopen(addr_file, "r")))
+               return f;
+ 
+-      acm_log(0, "notice - generating acm_addr.cfg file\n");
++      acm_log(0, "notice - generating %s file\n", addr_file);
+       if (!(f = popen("ib_acme -A", "r"))) {
+-              acm_log(0, "ERROR - cannot generate acm_addr.cfg\n");
++              acm_log(0, "ERROR - cannot generate %s\n", addr_file);
+               return NULL;
+       }
+       pclose(f);
 @@ -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");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ab70126..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 02e5cbc02d439de21ba3946ef1fc7c3a2d591b2c
-Top:    f1d60133c917c51b6a2e5412d02e961bac10d966
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-02 17:15:23 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index b992c8c..39c0369 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2507,9 +2507,9 @@ static FILE *acm_open_addr_file(void)
-       if ((f = fopen(addr_file, "r")))
-               return f;
- 
--      acm_log(0, "notice - generating acm_addr.cfg file\n");
-+      acm_log(0, "notice - generating %s file\n", addr_file);
-       if (!(f = popen("ib_acme -A", "r"))) {
--              acm_log(0, "ERROR - cannot generate acm_addr.cfg\n");
-+              acm_log(0, "ERROR - cannot generate %s\n", addr_file);
-               return NULL;
-       }
-       pclose(f);