refresh

diff --git a/meta b/meta
index 6ba47abebe24c183d0b73191dd09a44f25206523..1261f408cd0bdb50854e9025720c7f5e97523c07 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e040b978ea8e032a6679a835fa5a91d18a687054
-Head: 4ed76affd42d55c90a47e35b0165a223a8b2fcc1
+Previous: d990e39af084f86cebc17c921806b41100ad347a
+Head: 2c59a1fd9610800ffe71503f52ee6f143aac7163
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -12,8 +12,7 @@ Applied:
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
   no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
-  log_port: 47f504cbb661e931bbb192e220e4aec9b907cf35
-  refresh-temp: 4ed76affd42d55c90a47e35b0165a223a8b2fcc1
+  log_port: 2c59a1fd9610800ffe71503f52ee6f143aac7163
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/log_port b/patches/log_port
index 17feb389f4a925b115f54972f60dcd3a39ac73fc..111c5ef7654293c7c3e3bf258a080eb4fb2b2c3e 100644 (file)
--- a/patches/log_port
+++ b/patches/log_port
@@ -1,5 +1,5 @@
 Bottom: c74c104f2280f5a29202ce1d4dec0a24004cece3
-Top:    c74c104f2280f5a29202ce1d4dec0a24004cece3
+Top:    e565f94fc75f01ab3364eb32f74417564c154c57
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:51:38 -0800
 
@@ -14,4 +14,29 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index aa26fc5..ed9adec 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1597,6 +1597,7 @@ static void CDECL_FUNC acm_retry_handler(void *context)
+ 
+ static void acm_init_server(void)
+ {
++      FILE *f;
+       int i;
+ 
+       for (i = 0; i < FD_SETSIZE - 1; i++) {
+@@ -1605,6 +1606,13 @@ static void acm_init_server(void)
+               client[i].sock = INVALID_SOCKET;
+               atomic_init(&client[i].refcnt);
+       }
++
++      if (!(f = fopen("/var/run/ibacm.port", "w"))) {
++              acm_log(0, "notice - cannot publish ibacm port number\n");
++              return;
++      }
++      fprintf(f, "%d\n", server_port);
++      fclose(f);
+ }
+ 
+ static int acm_listen(void)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 12cdd81..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: c74c104f2280f5a29202ce1d4dec0a24004cece3
-Top:    e565f94fc75f01ab3364eb32f74417564c154c57
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 12:11:41 -0800
-
-Refresh of log_port
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index aa26fc5..ed9adec 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1597,6 +1597,7 @@ static void CDECL_FUNC acm_retry_handler(void *context)
- 
- static void acm_init_server(void)
- {
-+      FILE *f;
-       int i;
- 
-       for (i = 0; i < FD_SETSIZE - 1; i++) {
-@@ -1605,6 +1606,13 @@ static void acm_init_server(void)
-               client[i].sock = INVALID_SOCKET;
-               atomic_init(&client[i].refcnt);
-       }
-+
-+      if (!(f = fopen("/var/run/ibacm.port", "w"))) {
-+              acm_log(0, "notice - cannot publish ibacm port number\n");
-+              return;
-+      }
-+      fprintf(f, "%d\n", server_port);
-+      fclose(f);
- }
- 
- static int acm_listen(void)