refresh

diff --git a/meta b/meta
index 1e4e407f9a072b02b771d3d853bec6441204aab0..420a3fec62bbd4b5b3afc0a3a64b22b1d77cd212 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 2b0160a0a28da86ec6ed2b430a7f1d528dba0602
-Head: 0d845cc9208d2129433ae9f08a2c44a7770f2e57
+Previous: 3b1f494b69e4e57e58a6288a289763607ea327d8
+Head: 6e80f7f707526acd055d5081b9f70d6bdda00b1a
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 7b29fa2e46e60f2cec734b59f7efe8cdeec59660
-  cfg: e1c8476c90624f2345ef3f19aae90a21363ba507
-  refresh-temp: 0d845cc9208d2129433ae9f08a2c44a7770f2e57
+  cfg: 6e80f7f707526acd055d5081b9f70d6bdda00b1a
 Unapplied:
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index 6582f379049ff9afea54a290af7279a29aa46338..5247d84465f50f831e5e113813ade190a1d09e56 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
 Bottom: d4ad38b0621522078c4a0701602ea4b83a80e903
-Top:    9b9f7bf0bb8726c6cf07b631ea424b7797046fc0
+Top:    efb0015c28eb2e4a16212f36f9be11c5627c6ac2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -79,7 +79,9 @@ index 2b1e1fd..d64719a 100755
                        show_usage(argv[0]);
                        exit(1);
 diff --git a/src/acme.c b/src/acme.c
-index d9d9871..42a5397 100644
+old mode 100644
+new mode 100755
+index d9d9871..8a64b7f
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -39,6 +39,8 @@
@@ -132,8 +134,8 @@ index d9d9871..42a5397 100644
                        make_opts = 1;
                        break;
 +              case 'D':
-+                      snprintf(opts_file, "%s/acm_opts.cfg", 80, optarg);
-+                      snprintf(addr_file, "%s/acm_addr.cfg", 80, optarg);
++                      snprintf(opts_file, 80, "%s/acm_opts.cfg", optarg);
++                      snprintf(addr_file, 80, "%s/acm_addr.cfg", optarg);
 +                      break;
                default:
                        show_usage(argv[0]);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 567941f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 9b9f7bf0bb8726c6cf07b631ea424b7797046fc0
-Top:    efb0015c28eb2e4a16212f36f9be11c5627c6ac2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-28 11:15:10 -0700
-
-Refresh of cfg
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-old mode 100644
-new mode 100755
-index 42a5397..8a64b7f
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -526,8 +526,8 @@ int CDECL_FUNC main(int argc, char **argv)
-                       make_opts = 1;
-                       break;
-               case 'D':
--                      snprintf(opts_file, "%s/acm_opts.cfg", 80, optarg);
--                      snprintf(addr_file, "%s/acm_addr.cfg", 80, optarg);
-+                      snprintf(opts_file, 80, "%s/acm_opts.cfg", optarg);
-+                      snprintf(addr_file, 80, "%s/acm_addr.cfg", optarg);
-                       break;
-               default:
-                       show_usage(argv[0]);