projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f016252
)
Use grml_logs/fai as CHECKLOG source
author
Christian Hofstaedtler
<ch@grml.org>
Sat, 26 Nov 2011 12:30:34 +0000
(13:30 +0100)
committer
Christian Hofstaedtler
<ch@grml.org>
Sat, 26 Nov 2011 12:30:34 +0000
(13:30 +0100)
grml-live
patch
|
blob
|
history
diff --git
a/grml-live
b/grml-live
index
80f5b2d
..
3f42b78
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-642,7
+642,7
@@
else
# notice: 'fai dirinstall' does not seem to exit appropriate, so:
ERROR=''
# notice: 'fai dirinstall' does not seem to exit appropriate, so:
ERROR=''
- CHECKLOG=
/var/log/fai/$HOSTNAME/last
+ CHECKLOG=
"$LOG_OUTPUT"/fai/
if [ -r "$CHECKLOG/software.log" ] ; then
# 1 errors during executing of commands
grep 'dpkg: error processing' $CHECKLOG/software.log >> $LOGFILE && ERROR=1
if [ -r "$CHECKLOG/software.log" ] ; then
# 1 errors during executing of commands
grep 'dpkg: error processing' $CHECKLOG/software.log >> $LOGFILE && ERROR=1
@@
-666,10
+666,6
@@
else
log "Finished execution of stage 'fai dirinstall' [$(date)]"
einfo "Finished execution of stage 'fai dirinstall'"
fi
log "Finished execution of stage 'fai dirinstall' [$(date)]"
einfo "Finished execution of stage 'fai dirinstall'"
fi
-
- einfo "Find FAI build logs at $(readlink -f /var/log/fai/$HOSTNAME/last)"
- log "Find FAI build logs at $(readlink -f /var/log/fai/$HOSTNAME/last)"
- eend 0
fi
fi # BUILD_DIRTY?
# }}}
fi
fi # BUILD_DIRTY?
# }}}