refresh

diff --git a/meta b/meta
index 5f4445d087fc783baab30ec194942f1550fd4435..335a888bcfb345593f59c2824ae000be0e658a4e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3eb0fe1972759cad405d466b091779abd48a0245
-Head: 707ff8680507f79957e75cfeb4552ef75d62b89b
+Previous: 596ac23fea00ffdc33351aa70705c8cd19613dab
+Head: 3eb8f395f9a52f04c5b408812e743566e6d673fe
 Applied:
-  deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
-  refresh-temp: 707ff8680507f79957e75cfeb4552ef75d62b89b
+  deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
 Unapplied:
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
   counters: 0807eb0ca9d79773cfc846ed24e708d9a5842164

diff --git a/patches/deam b/patches/deam
index a6ae82fb27d68918d6ec88f37408a8138d5aa8d0..9bc27dcee28dd4d6d1c5f11ea153aa4404ac32fc 100644 (file)
--- a/patches/deam
+++ b/patches/deam
@@ -1,5 +1,5 @@
 Bottom: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
-Top:    3f0cd7ed6f329afff1dfddf4cff25880f32dd99e
+Top:    c20b3d52fc6f2174569f4497060aa6dce8bb0b86
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:19:57 -0700
 
@@ -13,7 +13,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 53a8e7b..2afb8f2 100644
+index 53a8e7b..210fd30 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -3081,7 +3081,8 @@ static void daemonize(void)
@@ -26,17 +26,20 @@ index 53a8e7b..2afb8f2 100644
        printf("   [-A addr_file]   - address configuration file\n");
        printf("                      (default %s/%s\n", ACM_DEST_DIR, ACM_ADDR_FILE);
        printf("   [-O option_file] - option configuration file\n");
-@@ -3090,12 +3091,12 @@ static void show_usage(char *program)
+@@ -3090,12 +3091,15 @@ static void show_usage(char *program)
  
  int CDECL_FUNC main(int argc, char **argv)
  {
 -      int op, daemon = 0;
 +      int op, daemon = 1;
  
-       while ((op = getopt(argc, argv, "DA:O:")) != -1) {
+-      while ((op = getopt(argc, argv, "DA:O:")) != -1) {
++      while ((op = getopt(argc, argv, "DPA:O:")) != -1) {
                switch (op) {
--              case 'D':
+               case 'D':
 -                      daemon = 1;
++                      /* option no longer required */
++                      break;
 +              case 'P':
 +                      daemon = 0;
                        break;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1ed3e36..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 3f0cd7ed6f329afff1dfddf4cff25880f32dd99e
-Top:    c20b3d52fc6f2174569f4497060aa6dce8bb0b86
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-29 00:18:42 -0700
-
-Refresh of deam
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 2afb8f2..210fd30 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -3093,8 +3093,11 @@ int CDECL_FUNC main(int argc, char **argv)
- {
-       int op, daemon = 1;
- 
--      while ((op = getopt(argc, argv, "DA:O:")) != -1) {
-+      while ((op = getopt(argc, argv, "DPA:O:")) != -1) {
-               switch (op) {
-+              case 'D':
-+                      /* option no longer required */
-+                      break;
-               case 'P':
-                       daemon = 0;
-                       break;