From d037cb57c702249567ab0131a9f24e184bacf7e9 Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Thu, 31 Jul 2008 14:14:37 -0700 Subject: [PATCH] build/install: dat.conf entry removal did not remove corrupted v1 entry. entry removal for v1 entries should match first field with OpenIB-* and ignore rest. Signed-off by: Arlin Davis ardavis@ichips.intel.com --- Makefile.am | 2 +- dapl.spec.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index bc7926d..bccc6ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -385,7 +385,7 @@ dist-hook: dapl.spec install-exec-hook: if test -e $(sysconfdir)/dat.conf; then \ echo "exec-hook"; \ - sed -e '/OpenIB-.* u1/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ + sed -e '/OpenIB-.*/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \ cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \ fi; \ echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(sysconfdir)/dat.conf; \ diff --git a/dapl.spec.in b/dapl.spec.in index 89351c9..3fffbb7 100644 --- a/dapl.spec.in +++ b/dapl.spec.in @@ -90,13 +90,13 @@ rm -rf %{buildroot} %post /sbin/ldconfig if [ -e %{_sysconfdir}/dat.conf ]; then - sed -e '/OpenIB-.* u1/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl + sed -e '/OpenIB-.*/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf fi echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> %{_sysconfdir}/dat.conf echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> %{_sysconfdir}/dat.conf -echo OpenIB-mthca0-1 u2.0 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> %{_sysconfdir}/dat.conf -echo OpenIB-mthca0-2 u2.0 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> %{_sysconfdir}/dat.conf +echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> %{_sysconfdir}/dat.conf +echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> %{_sysconfdir}/dat.conf echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> %{_sysconfdir}/dat.conf echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> %{_sysconfdir}/dat.conf -- 2.41.0