X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=8a35f29ccf4bd091b0f27c002aea029916e1a7ca;hb=c59878b7597b82fc8f94ba5312c01e0a94075a4f;hp=52772400046ca23ddd9f29aff4d546e7a9e068c5;hpb=2708f441697d1b9cd0443b433478ff222bac8a6d;p=grml-debootstrap.git

diff --git a/chroot-script b/chroot-script
index 5277240..8a35f29 100755
--- a/chroot-script
+++ b/chroot-script
@@ -11,12 +11,10 @@
 # shellcheck disable=SC2317  # shellcheck has trouble understanding the code flow in this file
 
 # error_handler {{{
-if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then
-   set -e
-   set -E
-   set -o pipefail
-   trap "error_handler" ERR
-fi
+set -e
+set -E
+set -o pipefail
+trap "error_handler" ERR
 # }}}
 
 # shellcheck source=config
@@ -621,7 +619,7 @@ efi_setup() {
 
   mkdir -p /boot/efi
   echo "Mounting $EFI on /boot/efi"
-  mount "$EFI" /boot/efi || return 1
+  mount "$EFI" /boot/efi
 
   # if efivarfs kernel module is loaded, but efivars isn't,
   # then we need to mount efivarfs for efibootmgr usage
@@ -631,7 +629,7 @@ efi_setup() {
   fi
 
   echo "Invoking efibootmgr"
-  efibootmgr || return 1
+  efibootmgr
 }
 
 # grub configuration/installation {{{
@@ -678,7 +676,7 @@ grub_install() {
     return 0
   fi
 
-  efi_setup || return 1
+  efi_setup
 
   if [ -n "$EFI" ] ; then
     GRUB_PACKAGE=grub-efi-amd64
@@ -806,7 +804,8 @@ trap signal_handler HUP INT QUIT TERM
      custom_scripts upgrade_system remove_apt_cache services \
      remove_chrootmirror; do
      if stage $i ; then
-       $i && stage $i 'done' || exit 1
+       $i
+       stage $i 'done'
      fi
   done
   # always execute the finalize stage: