From e9106411ee35c18160f34d1f57f956346b49034c Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 4 Mar 2011 11:06:04 -0800 Subject: [PATCH] delete --- meta | 3 +- patches/autoaddr | 93 ------------------------------------------------ 2 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 patches/autoaddr diff --git a/meta b/meta index a4bef9c..bf85520 100644 --- a/meta +++ b/meta @@ -1,5 +1,5 @@ Version: 1 -Previous: 8419406e38a8189a52d23090d24e0e2997ee918e +Previous: 3e736a2ef6e9901875ac9adeeb48834d3e2524a5 Head: 3ca40fdbdc57839ee3ee0e18bfd116023db2dba4 Applied: addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0 @@ -10,7 +10,6 @@ Applied: port_up: 1af4666bab8720dd46666a4c13bd93f6dcc1bd1a port_down: 3ca40fdbdc57839ee3ee0e18bfd116023db2dba4 Unapplied: - autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709 addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a Hidden: diff --git a/patches/autoaddr b/patches/autoaddr deleted file mode 100644 index b17d708..0000000 --- a/patches/autoaddr +++ /dev/null @@ -1,93 +0,0 @@ -Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d -Top: e214b1359219482bee2fd9e8ace89cc8c50af00a -Author: Sean Hefty -Date: 2011-01-20 09:30:45 -0800 - -Define option to auto-generate addresses - -Add an option that instructs the ib_acm service to automatically -generate the address configureation file. This will -make it easier to handle dynamic changes to system configuration. - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/man/ib_acm.1 b/man/ib_acm.1 -index acf6a1d..16d899d 100644 ---- a/man/ib_acm.1 -+++ b/man/ib_acm.1 -@@ -4,8 +4,25 @@ ib_acm \- address and route resolution services for InfiniBand. - .SH SYNOPSIS - .sp - .nf --\fIib_acm\fR -+\fIib_acm\fR [-D] [-A addr_file] [-a] [-O option_file] - .fi -+.SH "OPTIONS" -+.TP -+\-D -+Runs the ib_acm service as a daemon. -+.TP -+\-A addr_file -+Specifies the address configuration file. The ib_acm service uses the -+contents of this file to assign addresses to local devices and ports. -+.TP -+\-a -+If specified, indicates that the ib_acm service should automatically -+generate the address configuration file and update it based on certain -+network events. -+.TP -+\-O option_file -+Specifies the option configuration file. The ib_acm service uses the -+contents of this file to override any default configuration options. - .SH "DESCRIPTION" - The IB ACM implements and provides a framework for name, - address, and route (path) resolution services over InfiniBand. -diff --git a/src/acm.c b/src/acm.c -index 1f3c470..e137f70 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2009-2010 Intel Corporation. All rights reserved. -+ * Copyright (c) 2009-2011 Intel Corporation. All rights reserved. - * - * This software is available to you under the OpenIB.org BSD license - * below: -@@ -209,6 +209,7 @@ PER_THREAD char log_data[ACM_MAX_ADDRESS]; - - static char *opts_file = "/etc/ibacm/acm_opts.cfg"; - static char *addr_file = "/etc/ibacm/acm_addr.cfg"; -+static int auto_addr = 0; - static char log_file[128] = "/var/log/ibacm.log"; - static int log_level = 0; - static char lock_file[128] = "/var/lock/ibacm.pid"; -@@ -2861,7 +2862,7 @@ static FILE *acm_open_addr_file(void) - { - FILE *f; - -- if ((f = fopen(addr_file, "r"))) -+ if (!auto_addr && (f = fopen(addr_file, "r"))) - return f; - - acm_log(0, "notice - generating acm_addr.cfg file\n"); -@@ -2920,6 +2921,7 @@ static void show_usage(char *program) - printf(" [-D] - run as a daemon\n"); - printf(" [-A addr_file] - address configuration file\n"); - printf(" (default %s/%s\n", ACM_DEST_DIR, ACM_ADDR_FILE); -+ printf(" [-a] - automatically generate and update addresses\n"); - printf(" [-O option_file] - option configuration file\n"); - printf(" (default %s/%s\n", ACM_DEST_DIR, ACM_OPTS_FILE); - } -@@ -2938,6 +2940,9 @@ int CDECL_FUNC main(int argc, char **argv) - case 'A': - addr_file = optarg; - break; -+ case 'a': -+ auto_addr = 1; -+ break; - case 'O': - opts_file = optarg; - break; -- 2.46.0