From fbe5b8dccb44dc08fd24832410fb0efd1b0dc0af Mon Sep 17 00:00:00 2001 From: "M. Dietrich" Date: Tue, 30 Aug 2016 12:21:06 +0200 Subject: [PATCH] fix error_out (line/errno handling) Closes: #84 [via git-merge-pr] --- mklive.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mklive.sh.in b/mklive.sh.in index a69bf05..be41374 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -26,7 +26,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- -trap "error_out $LINENO $?" INT TERM 0 +trap 'error_out $? $LINENO' INT TERM 0 readonly REQUIRED_PKGS="base-files libgcc dash coreutils sed tar gawk syslinux grub-i386-efi grub-x86_64-efi squashfs-tools xorriso" readonly INITRAMFS_PKGS="binutils xz device-mapper" @@ -37,7 +37,7 @@ info_msg() { } die() { info_msg "ERROR: $@" - error_out 1 + error_out 1 $LINENO } print_step() { CURRENT_STEP=$((CURRENT_STEP+1))