[ofa-general] Re: [PATCH 3/7] Move nodenamemap out of infiniband-diags into libosmcomp

[Ira Weiny]

On Mon, 5 Nov 2007 21:33:58 +0200
Sasha Khapyorsky <sashak at voltaire.com> wrote:

> On 10:32 Mon 05 Nov     , Ira Weiny wrote:
> > On Sun, 4 Nov 2007 18:07:43 +0200
> > Sasha Khapyorsky <sashak at voltaire.com> wrote:
> > > So --with-node-name-map=file configure option is removed completely from
> > > diags and how mapping will work by default is only depens on how OpenSM
> > > (which is separate package) was configured.
> > > 
> > > Do you think it would be useful useful to keep default map name as
> > > configure option for infiniband-diags and to not depend from OpenSM
> > > configuration (it seems easy doable - we could put some
> > > default_node_name_map_file variable in ibdiag_common.c or so)? And then
> > > we probably don't need such configure option for OpenSM?
> > > 
> > 
> > Actually I would prefer a default which does not have to be configured.  Would
> > this be acceptable?
> 
> Yes. I'm fine this this.
> 
> > Perhaps <sysconfdir>/ib-node-name-map?
> 
> Or under /etc/ofa/ ?

I think <sysconfdir> is appropriate.  OFED can specify /etc/ofa if they wish.

The patch is attached,
Ira


>From f395cae1c20daa15ce4ab5674df266bf28c2d318 Mon Sep 17 00:00:00 2001
From: Ira K. Weiny <weiny2 at llnl.gov>
Date: Wed, 7 Nov 2007 19:12:57 -0800
Subject: [PATCH] Specify a default node-name-map of <sysconfdir>/ib-node-name-map


Signed-off-by: Ira K. Weiny <weiny2 at llnl.gov>
---
 opensm/configure.in |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/opensm/configure.in b/opensm/configure.in
index abf36c5..2d5d72c 100644
--- a/opensm/configure.in
+++ b/opensm/configure.in
@@ -70,7 +70,9 @@ OPENIB_OSM_CONSOLE_SOCKET_SEL
 dnl select performance manager or not
 OPENIB_OSM_PERF_MGR_SEL
 
-dnl Check for the specification of a default node name map file
+dnl Check for a different default node name map file
+dnl default {sysconfdir}/ib-node-name-map
+NODENAMEMAPFILE=ib-node-name-map
 AC_MSG_CHECKING(for --with-node-name-map )
 AC_ARG_WITH(node-name-map,
     AC_HELP_STRING([--with-node-name-map=file],
@@ -86,15 +88,12 @@ AC_ARG_WITH(node-name-map,
 )
 AC_MSG_RESULT(${withnodenamemap=no})
 
-if test $withnodenamemap = "yes"; then
-   NODENAMEMAP_TMP1="`eval echo ${sysconfdir}/$NODENAMEMAPFILE`"
-   NODENAMEMAP_TMP2="`echo $NODENAMEMAP_TMP1 | sed 's/^NONE/$ac_default_prefix/'`"
-   NODENAMEMAP="`eval echo $NODENAMEMAP_TMP2`"
-
-   AC_DEFINE_UNQUOTED(HAVE_DEFAULT_NODENAME_MAP,
-	         ["$NODENAMEMAP"],
-	         [Define a default node name map file])
-fi
+NODENAMEMAP_TMP1="`eval echo ${sysconfdir}/$NODENAMEMAPFILE`"
+NODENAMEMAP_TMP2="`echo $NODENAMEMAP_TMP1 | sed 's/^NONE/$ac_default_prefix/'`"
+NODENAMEMAP="`eval echo $NODENAMEMAP_TMP2`"
+AC_DEFINE_UNQUOTED(HAVE_DEFAULT_NODENAME_MAP,
+	["$NODENAMEMAP"],
+	[Define a default node name map file])
 
 dnl select example event plugin or not
 OPENIB_OSM_DEFAULT_EVENT_PLUGIN_SEL
-- 
1.5.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Specify-a-default-node-name-map-of-sysconfdir-ib-n.patch
Type: application/octet-stream
Size: 1797 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/general/attachments/20071107/aa3cb52b/attachment.obj>