From af25563aa5904996f11cd48f68fd360e6e2c13cb Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 30 Jun 2011 11:27:33 -0700 Subject: [PATCH] commit --- meta | 3 +- patches/ibacm-run-as-daemon-by-default | 60 -------------------------- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 patches/ibacm-run-as-daemon-by-default diff --git a/meta b/meta index 6332781..a8113e5 100644 --- a/meta +++ b/meta @@ -1,8 +1,7 @@ Version: 1 -Previous: 3c9ad44af03943f658f99f9505444ecb9ecf8745 +Previous: 1580cab0825d58194a27538da313e42506af5fa8 Head: 492a75211ea7e4cf60115164f45503b5b02d7798 Applied: - ibacm-run-as-daemon-by-default: eb1881bd3740d99b9492d9e8d4fa5666cfb3931b fixup-starting-curly-brace-ali: 492a75211ea7e4cf60115164f45503b5b02d7798 Unapplied: counters: b491f82e1c52dd1da5e568782b5fed4e58f1f19e diff --git a/patches/ibacm-run-as-daemon-by-default b/patches/ibacm-run-as-daemon-by-default deleted file mode 100644 index f0c16e7..0000000 --- a/patches/ibacm-run-as-daemon-by-default +++ /dev/null @@ -1,60 +0,0 @@ -Bottom: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3 -Top: 291e865141371dd166944d40cde7ecb21151f2e0 -Author: Sean Hefty -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 - - ---- - -diff --git a/man/ib_acm.1 b/man/ib_acm.1 -index acf6a1d..af57d0b 100644 ---- a/man/ib_acm.1 -+++ b/man/ib_acm.1 -@@ -38,7 +38,7 @@ These steps assume that the user has administrative privileges. - .P - 2. Install the IB ACM package. This installs ib_acm, and ib_acme. - .P --3. Run 'ib_acm -D' as administrator to start the ib_acm daemon. -+3. Run 'ib_acm' as administrator to start the ib_acm daemon. - .P - 4. Optionally, run 'ib_acme -d -v' to verify that - the ib_acm service is running. -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; -- 2.46.0