refresh

diff --git a/meta b/meta
index 2e54238499403f4dfaf17fdbc26c2059b5232df4..64adb52e6f1e549c47e770dcc5508271b0165189 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 5becf3a10cfec0d4d3e997ce9579d56597f8705e
-Head: 421f8c7e1ea4214072e783e0d1cfb21266a6cdc5
+Previous: 0a9901535a259ed0f581fd04b8660e1f765d2832
+Head: c3810c2aa0b1a83a4c8525de58f8e17bb5d5dad6
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 7b29fa2e46e60f2cec734b59f7efe8cdeec59660
-  cfg: 6e80f7f707526acd055d5081b9f70d6bdda00b1a
-  refresh-temp: 421f8c7e1ea4214072e783e0d1cfb21266a6cdc5
+  cfg: c3810c2aa0b1a83a4c8525de58f8e17bb5d5dad6
 Unapplied:
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index 5247d84465f50f831e5e113813ade190a1d09e56..03eb03e14639d964ad529cf52a1c24f02c902eed 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
 Bottom: d4ad38b0621522078c4a0701602ea4b83a80e903
-Top:    efb0015c28eb2e4a16212f36f9be11c5627c6ac2
+Top:    e51eb499bbd274dcb85a7a69e7837890cd9a0e16
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -16,15 +16,15 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 2b1e1fd..d64719a 100755
+index 2b1e1fd..afa9917 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 *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;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fcca7fc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: efb0015c28eb2e4a16212f36f9be11c5627c6ac2
-Top:    e51eb499bbd274dcb85a7a69e7837890cd9a0e16
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-28 11:16:12 -0700
-
-Refresh of cfg
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index d64719a..afa9917 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -191,8 +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 *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;