From: Michael Prokop <mika@grml.org>
Date: Fri, 26 Jan 2024 15:09:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/269'
X-Git-Tag: v0.107~1
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=6c84cfc48c471d18ec671d9682e08b3bf647a9ac;hp=1675ca627a824e701a55d5b50bcf9a969db7c6e1;p=grml-debootstrap.git

Merge remote-tracking branch 'origin/pr/269'
---

diff --git a/grml-debootstrap b/grml-debootstrap
index 9ad2662..dfef90b 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -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
@@ -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
-
 }
 # }}}