refresh

diff --git a/meta b/meta
index 90f22a9bde9122a62b8f1e00fd7c5b5af8757e6f..58fdf88b4b95c38f33f7d08c6c17b80ece6947eb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: f71dcf81798ce34231e8a075422a9141bb5c31e8
-Head: 97d052a686fa1b0d630787db7828ecd1790b9d3f
+Previous: 87c28f494c21cb19f6da0a04a092cd17cbbf2c70
+Head: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
 Applied:
-  deam: 35896a9c5f6d4b93a767e8801d00d774e31e19ec
-  refresh-temp: 97d052a686fa1b0d630787db7828ecd1790b9d3f
+  deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/deam b/patches/deam
index eb83f5dbb2127d8a0e7363fbcd1093687a2ec5ec..a6ae82fb27d68918d6ec88f37408a8138d5aa8d0 100644 (file)
--- a/patches/deam
+++ b/patches/deam
@@ -1,5 +1,5 @@
 Bottom: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
-Top:    e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
+Top:    3f0cd7ed6f329afff1dfddf4cff25880f32dd99e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:19:57 -0700
 
@@ -12,4 +12,33 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 53a8e7b..2afb8f2 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -3081,7 +3081,8 @@ 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 (default)\n");
++      printf("   [-P]             - run as a standard process\n");
+       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)
+ 
+ int CDECL_FUNC main(int argc, char **argv)
+ {
+-      int op, daemon = 0;
++      int op, daemon = 1;
+ 
+       while ((op = getopt(argc, argv, "DA:O:")) != -1) {
+               switch (op) {
+-              case 'D':
+-                      daemon = 1;
++              case 'P':
++                      daemon = 0;
+                       break;
+               case 'A':
+                       addr_file = optarg;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 638a8a7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
-Top:    3f0cd7ed6f329afff1dfddf4cff25880f32dd99e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-27 10:23:07 -0700
-
-Refresh of deam
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 53a8e7b..2afb8f2 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -3081,7 +3081,8 @@ 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 (default)\n");
-+      printf("   [-P]             - run as a standard process\n");
-       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)
- 
- int CDECL_FUNC main(int argc, char **argv)
- {
--      int op, daemon = 0;
-+      int op, daemon = 1;
- 
-       while ((op = getopt(argc, argv, "DA:O:")) != -1) {
-               switch (op) {
--              case 'D':
--                      daemon = 1;
-+              case 'P':
-+                      daemon = 0;
-                       break;
-               case 'A':
-                       addr_file = optarg;