rename

diff --git a/meta b/meta
index 841428989d14845e65568fb6512ea35a02889b6f..413f65a26ef2231a1969bb8cc7b1e54f3bbb1e85 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,8 @@
 Version: 1
-Previous: ae04b52f3f9d67b6be779ed519efe31955bfdbd3
+Previous: 7be22985a442fe1e414c6b8cf31c27afead27432
 Head: 4115b1d76cc4636e90343cc955bfbacf04d3bc8d
 Applied:
-  deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
+  daemon: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
   counters: 50c4373f67227780faa494f4a92867239aaaf2f1
   alias: 66b03436cb915b08240eb12ee1ec8779067cc5f8

diff --git a/patches/daemon b/patches/daemon
new file mode 100644 (file)
index 0000000..9bc27dc
--- /dev/null
+++ b/patches/daemon
@@ -0,0 +1,47 @@
+Bottom: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
+Top:    c20b3d52fc6f2174569f4497060aa6dce8bb0b86
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-27 10:19:57 -0700
+
+ibacm: Run as daemon by default
+
+Start ibacm as a daemon by default, with an optional non-daemon mode.
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 53a8e7b..210fd30 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,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, "DPA:O:")) != -1) {
+               switch (op) {
+               case 'D':
+-                      daemon = 1;
++                      /* option no longer required */
++                      break;
++              case 'P':
++                      daemon = 0;
+                       break;
+               case 'A':
+                       addr_file = optarg;

diff --git a/patches/deam b/patches/deam
deleted file mode 100644 (file)
index 9bc27dc..0000000
--- a/patches/deam
+++ /dev/null
@@ -1,47 +0,0 @@
-Bottom: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
-Top:    c20b3d52fc6f2174569f4497060aa6dce8bb0b86
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-27 10:19:57 -0700
-
-ibacm: Run as daemon by default
-
-Start ibacm as a daemon by default, with an optional non-daemon mode.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 53a8e7b..210fd30 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,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, "DPA:O:")) != -1) {
-               switch (op) {
-               case 'D':
--                      daemon = 1;
-+                      /* option no longer required */
-+                      break;
-+              case 'P':
-+                      daemon = 0;
-                       break;
-               case 'A':
-                       addr_file = optarg;