Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Starting with 1.6.0 our kernel package will now actually be
[fs/lustre-release.git]
/
build
/
lmake
diff --git
a/build/lmake
b/build/lmake
index
13264d7
..
cb177a2
100755
(executable)
--- 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
# 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"
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
# 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
fatal 1 "update_oldconfig failed: $RC. See log above."
fi
rm -f $logfile