X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flmake;h=cb177a287dfbbecdf3c8750c60db59545488827a;hb=cfaf31a01d1e3023611130ec1f8ece073f0092b9;hp=13264d7a62e3c23d90d0cfe73bfbdd3289217392;hpb=26a6d80572ed171526ab3527d1a5ed3a5d18721e;p=fs%2Flustre-release.git

diff --git a/build/lmake b/build/lmake
index 13264d7..cb177a2 100755
--- a/build/lmake
+++ b/build/lmake
@@ -383,7 +383,9 @@ depend_kernel()
     # for them to review and adjust accordingly.
     local logfile=$(mktemp /tmp/XXXXXX)
     #timed_run 300 $TOPDIR/build/update_oldconfig $logfile
-    strace -f -o update_oldconfig.strace $TOPDIR/build/update_oldconfig $logfile
+    #local RC=${PIPESTATUS[0]}
+    #local RC=$(strace -f -o update_oldconfig.strace bash -c "$TOPDIR/build/update_oldconfig $logfile; echo \$?")
+    $TOPDIR/build/update_oldconfig $logfile
     local RC=${PIPESTATUS[0]}
     if [ $RC -eq 143 ]; then
         fatal 1 "update_oldconfig timed out"
@@ -391,8 +393,10 @@ depend_kernel()
 	# dump the log
         cat $logfile
         rm -f $logfile
-	cat update_oldconfig.strace
-	rm -f update_oldconfig.strace
+	if [ -f update_oldconfig.strace ]; then
+	    cat update_oldconfig.strace
+	    rm -f update_oldconfig.strace
+        fi
         fatal 1 "update_oldconfig failed: $RC. See log above."
     fi
     rm -f $logfile