From c59878b7597b82fc8f94ba5312c01e0a94075a4f Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Wed, 25 Oct 2023 12:48:00 -0400 Subject: [PATCH] trigger error handler as soon as possible https://github.com/grml/grml-debootstrap/issues/224#issuecomment-1779673194 --- chroot-script | 2 +- grml-debootstrap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chroot-script b/chroot-script index 2c294653..8a35f29c 100755 --- a/chroot-script +++ b/chroot-script @@ -804,7 +804,7 @@ trap signal_handler HUP INT QUIT TERM custom_scripts upgrade_system remove_apt_cache services \ remove_chrootmirror; do if stage $i ; then - $i || exit 1 + $i stage $i 'done' fi done diff --git a/grml-debootstrap b/grml-debootstrap index d00dc0c0..97409bc9 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -2151,7 +2151,7 @@ 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" || bailout 2 "$i" + "$i" stage "${i}" 'done' rm -f "${STAGES}/${i}" fi