refresh

diff --git a/meta b/meta
index 88219d6f9ec4e05832af44e1e4fa83c804621f3e..9934810f6cf08dd34f3e7bdbbbf1ba391894e26f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: a0d197592405e44a548533a1aa3c12141d52247f
-Head: a035f118c0c96f62558f7ca21ac0c8d4d5264a1d
+Previous: 62177a133f01689478542e86b0ad89fdad3173c5
+Head: f82dfae0f15850f605465511fc8458799f32bb17
 Applied:
   daemon: d181ac6bc8261d6f0fe4935d2035e0beff560bd9
-  cfg: 187f7592a2601543da8cf16720e65aeffc0854d9
-  refresh-temp: a035f118c0c96f62558f7ca21ac0c8d4d5264a1d
+  cfg: f82dfae0f15850f605465511fc8458799f32bb17
 Unapplied:
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index 5e7f76252f3c1152017b2e2df1d14e5fd563f5e8..d144e169eb8e159c6c67d23eee913f84e3d9ae2a 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
 Bottom: c0b0b9437af8a63e1983d07068459108d805ce35
-Top:    baef440c67372b788a01e6058d5eaf74beb5be46
+Top:    78874173621b61fde50fac313009679ef66af15c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -15,6 +15,32 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/src/acm.c b/src/acm.c
+index 2b1e1fd..0e6908e 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -191,6 +191,8 @@ static struct acm_client client[FD_SETSIZE - 1];
+ static FILE *flog;
+ static lock_t log_lock;
+ 
++static char *opts_file = "\\etc\\ibacm\\acm_opts.cfg"
++static char *addr_file = "\\etc\\ibacm\\acm_addr.cfg"
+ static char log_file[128] = "stdout";
+ static int log_level = 0;
+ static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
+@@ -2638,7 +2640,11 @@ static void daemonize(void)
+ static void show_usage(char *program)
+ {
+       printf("usage: %s\n", program);
+-      printf("   [-D] - run as a daemon\n");
++      printf("   [-D]             - run as a daemon\n");
++      printf("   [-A addr_file]   - address configuration file\n");
++      printf("                      (default /etc/ibacm/acm_addr.cfg\n");
++      printf("   [-O option_file] - option configuration file\n");
++      printf("                      (default /etc/ibacm/acm_opts.cfg\n");
+ }
+ 
+ int CDECL_FUNC main(int argc, char **argv)
 diff --git a/src/acme.c b/src/acme.c
 index 5a5a09a..85d4ada 100644
 --- a/src/acme.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f5ac5f9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: baef440c67372b788a01e6058d5eaf74beb5be46
-Top:    78874173621b61fde50fac313009679ef66af15c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-23 17:55:40 -0700
-
-Refresh of cfg
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 2b1e1fd..0e6908e 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -191,6 +191,8 @@ static struct acm_client client[FD_SETSIZE - 1];
- static FILE *flog;
- static lock_t log_lock;
- 
-+static char *opts_file = "\\etc\\ibacm\\acm_opts.cfg"
-+static char *addr_file = "\\etc\\ibacm\\acm_addr.cfg"
- static char log_file[128] = "stdout";
- static int log_level = 0;
- static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
-@@ -2638,7 +2640,11 @@ static void daemonize(void)
- static void show_usage(char *program)
- {
-       printf("usage: %s\n", program);
--      printf("   [-D] - run as a daemon\n");
-+      printf("   [-D]             - run as a daemon\n");
-+      printf("   [-A addr_file]   - address configuration file\n");
-+      printf("                      (default /etc/ibacm/acm_addr.cfg\n");
-+      printf("   [-O option_file] - option configuration file\n");
-+      printf("                      (default /etc/ibacm/acm_opts.cfg\n");
- }
- 
- int CDECL_FUNC main(int argc, char **argv)