Skip to content

Commit

Permalink
Support FAI's newer scripts.log, as used with FAI versions >=6.0
Browse files Browse the repository at this point in the history
Older FAI versions used to log the output of the scripts to shell.log,
now as of FAI versions >=6.0 they end up in scripts.log instead, so
also check those to identify failures during builds.
  • Loading branch information
mika committed Sep 7, 2023
1 parent cb68d92 commit 74c4bce
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions grml-live
Original file line number Diff line number Diff line change
Expand Up @@ -796,10 +796,16 @@ else
grep 'Unable to write mmap - msync (28 No space left on device)' $CHECKLOG/software.log >> $LOGFILE && ERROR=5
fi

# FAI versions <6.0 used to write to shell.log
if [ -r "$CHECKLOG/shell.log" ] ; then
grep 'FAILED with exit code' $CHECKLOG/shell.log >> $LOGFILE && ERROR=6
fi

# FAI versions >=6.0 always writes to scripts.log
if [ -r "$CHECKLOG/scripts.log" ] ; then
grep 'FAILED with exit code' $CHECKLOG/shell.log >> $LOGFILE && ERROR=6
fi

if [ -r "$CHECKLOG/fai.log" ] ; then
grep 'updatebase.*FAILED with exit code' "$CHECKLOG/fai.log" >> "$LOGFILE" && ERROR=7
grep 'instsoft.*FAILED with exit code' "$CHECKLOG/fai.log" >> "$LOGFILE" && ERROR=8
Expand Down

0 comments on commit 74c4bce

Please sign in to comment.