X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Flmake;h=d258b72cb1bac4e525762fcd973d8a4e939d4347;hp=65cbaa06de312775312d7f0500918a9bbde020b5;hb=bc1afa51e9f1df823e3b9aefb5513609ce1de521;hpb=6af10b9e7559e2522dc2890905a8ef5fd0734952

diff --git a/build/lmake b/build/lmake
index 65cbaa0..d258b72 100755
--- a/build/lmake
+++ b/build/lmake
@@ -381,10 +381,17 @@ depend_kernel()
     # use the expect script to "make oldconfig" and answer the questions for
     # new items conservatively.  QA will get notified on anything newly added
     # for them to review and adjust accordingly.
-    timed_run 300 $TOPDIR/build/update_oldconfig
-    if [ $? -eq 143 ]; then
+    local logfile=$(mktemp /tmp/XXXXXX)
+    timed_run 300 $TOPDIR/build/update_oldconfig $logfile
+    if [ ${PIPESTATUS[0]} -eq 143 ]; then
         fatal 1 "update_oldconfig timed out"
+    elif [ ${PIPESTATUS[0]} -ne 0 ]; then
+	# dump the log
+        cat $logfile
+        rm -f $logfile
+        fatal 1 "update_oldconfig failed: $?. See log above."
     fi
+    rm -f $logfile
     # now notify if resulting .config is different than $CONFIG_FILE
     local tmpfile=$(mktemp /tmp/XXXXXX)
     diff -I '^#.*' -u "$CONFIG_FILE" .config >$tmpfile