adjust stages executing for new error handling method

diff --git a/grml-debootstrap b/grml-debootstrap
index 17a8b1c..d00dc0c 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -2151,12 +2151,9 @@ for i in format_efi_partition prepare_vm mkfs tunefs \
          preparechroot execute_pre_scripts chrootscript execute_post_scripts \
          remove_configs umount_chroot grub_install umount_target fscktool ; do
     if stage "${i}" ; then
-      "$i"
-      if [ $? -eq 0 ]; then
-        stage "${i}" 'done' && rm -f "${STAGES}/${i}"
-      else
-        bailout 2 "$i"
-      fi
+      "$i" || bailout 2 "$i"
+      stage "${i}" 'done'
+      rm -f "${STAGES}/${i}"
     fi
 done