From: brian <brian>
Date: Wed, 17 May 2006 19:04:12 +0000 (+0000)
Subject: Disable the stracing of update_oldconfig.
X-Git-Tag: v1_7_100~482
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6de11116d14d44b97f7b749679e38d764e864432;ds=sidebyside

Disable the stracing of update_oldconfig.
---

diff --git a/build/lmake b/build/lmake
index f795415..cb177a2 100755
--- a/build/lmake
+++ b/build/lmake
@@ -384,15 +384,19 @@ depend_kernel()
     local logfile=$(mktemp /tmp/XXXXXX)
     #timed_run 300 $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 \$?")
+    #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"
     elif [ $RC -ne 0 ]; then
 	# 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