Improve creation of openib.conf

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/compat-rdma.spec b/compat-rdma.spec
index eba74bd15980a548cae924f0a0128dbb835da332..7bfdf350b68eedc40a38f9fd4e95fa03fec90b5f 100755 (executable)
--- a/compat-rdma.spec
+++ b/compat-rdma.spec
@@ -201,6 +201,7 @@ install -m 0644 $RPM_BUILD_DIR/%{_name}-%{_version}/ofed_scripts/openibd.service
 # Copy infiniband configuration
 install -d $RPM_BUILD_ROOT/%{RDMA_CONF_DIR}
 install -m 0644 $RPM_BUILD_DIR/%{_name}-%{_version}/ofed_scripts/openib.conf $RPM_BUILD_ROOT/%{RDMA_CONF_DIR}
+cat $RPM_BUILD_DIR/%{_name}-%{_version}/ofed_scripts/openib.conf.tmp >> $RPM_BUILD_ROOT/%{RDMA_CONF_DIR}/openib.conf
 
 %if %{build_ibp_server} || %{build_ibscif}
 # install overlay files and config

diff --git a/configure b/configure
index 03a07624e58878780afbd29d87b09631458948d6..ecbfaaed9efd647d51ea175bfcb96016112a4ec9 100755 (executable)
--- a/configure
+++ b/configure
@@ -239,13 +239,17 @@ function check_autofconf {
 }
 
 function add_conf {
-       COMMENT=$1
-       VALUE=$2
-       OICONF=${PWD}/ofed_scripts/openib.conf
-
-       echo "${COMMENT}" >> "${OICONF}"
-       echo "${VALUE}" >> "${OICONF}"
-       echo >> "${OICONF}"
+    COMMENT=$1
+    PARAM=${2%=*}
+    VALUE=${2#*=}
+    OICONF=${PWD}/ofed_scripts/openib.conf.tmp
+
+    touch $OICONF
+    if ! (grep -wq "^$PARAM" $OICONF > /dev/null 2>&1); then
+        echo >> "${OICONF}"
+        echo "${COMMENT}" >> "${OICONF}"
+        echo "${PARAM}=${VALUE}" >> "${OICONF}"
+    fi
 }
 
 main()