Skip to content

Commit

Permalink
fix debootstrap error handler
Browse files Browse the repository at this point in the history
We were using the old-style "RC" error checking. Now that has all been
moved to a global error handler, so we need to move log parsing there
as well.

Closes: #268
  • Loading branch information
anarcat committed Jan 23, 2024
1 parent 1675ca6 commit d8497cb
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions grml-debootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ error_handler() {
last_bash_command="$BASH_COMMAND"
echo "Unexpected non-zero exit code $last_exit_code in ${BASH_SOURCE[*]} at line ${BASH_LINENO[*]} detected!
last bash command: $last_bash_command"
if [ -r "$MNTPOINT/debootstrap/debootstrap.log" ] && \
[ -s "$MNTPOINT/debootstrap/debootstrap.log" ] ; then
einfo "Presenting last ten lines of debootstrap.log:"
tail -10 "${MNTPOINT}"/debootstrap/debootstrap.log
einfo "End of debootstrap.log"
fi
## Check if "bailout" function is available.
## This is not the case in chroot-script.
if command -v bailout >/dev/null 2>&1; then
Expand Down Expand Up @@ -1724,16 +1730,6 @@ debootstrap_system() {
# shellcheck disable=SC2086
"$DEBOOTSTRAP" $ARCHCMD $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$MIRROR"
fi

if [ $RC -ne 0 ] ; then
if [ -r "$MNTPOINT/debootstrap/debootstrap.log" ] && \
[ -s "$MNTPOINT/debootstrap/debootstrap.log" ] ; then
einfo "Presenting last ten lines of debootstrap.log:"
tail -10 "${MNTPOINT}"/debootstrap/debootstrap.log
einfo "End of debootstrap.log"
fi
fi

}
# }}}

Expand Down

0 comments on commit d8497cb

Please sign in to comment.