From: Amir Shehata <amir.shehata@intel.com>
Date: Tue, 4 Nov 2014 21:14:39 +0000 (-0800)
Subject: LU-5861 lnet: invoke lnetctl properly from startup script
X-Git-Tag: 2.6.91~36
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c840ee5e1223934299a05798ae64cdbe10a07157;p=fs%2Flustre-release.git

LU-5861 lnet: invoke lnetctl properly from startup script

Use the correct lnetctl command syntax to load default config:
lnetctl import < lnet.conf

Signed-off-by: Amir Shehata <amir.shehata@intel.com>
Change-Id: I54dd0d34f75b91c1c6ceb9745d817cb43f82ef25
Reviewed-on: http://review.whamcloud.com/12561
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/scripts/lnet b/lustre/scripts/lnet
index a98df4b..1a9d467 100644
--- a/lustre/scripts/lnet
+++ b/lustre/scripts/lnet
@@ -134,7 +134,7 @@ case "$1" in
 	# utility for parsing.  This will configure the items defined
 	# in YAML format in the config file.
 	if [ -f $LUSTRE_LNET_CONFIG_UTILITY ] && [ -f "$LUSTRE_LNET_CONFIG_FILE" ]; then
-		$LUSTRE_LNET_CONFIG_UTILITY $LUSTRE_LNET_CONFIG_FILE
+		$LUSTRE_LNET_CONFIG_UTILITY import < $LUSTRE_LNET_CONFIG_FILE
 	fi
 	run_postexec_check "start"
 	;;