From: nfshp <nfshp>
Date: Tue, 8 Apr 2003 09:35:30 +0000 (+0000)
Subject: the last merge b_devel to b_cray
X-Git-Tag: v1_7_100~1^38~18
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=148e2bb2e2a7f5a3ff0af22256af29a422426304;p=fs%2Flustre-release.git

the last merge b_devel to b_cray
---

diff --git a/lustre/utils/lconf.in b/lustre/utils/lconf.in
index b52b097f..f17ff25 100755
--- a/lustre/utils/lconf.in
+++ b/lustre/utils/lconf.in
@@ -1750,7 +1750,7 @@ def sys_set_timeout(timeout):
     # the command overrides the value in the node config
     if config.timeout > 0:
         timeout = config.timeout
-    if timeout > 0:
+    if timeout != None and timeout > 0:
         sysctl('lustre/timeout', timeout)
 
 def sys_set_ptldebug():