From 3278c1df913822ba5e5c7897c4eb66d63ebdd34e Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 8 May 2017 01:09:47 +0200
Subject: [PATCH] buildiso: reestore default error handling

---
 lib/util-chroot.sh | 5 +----
 lib/util-iso.sh    | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/util-chroot.sh b/lib/util-chroot.sh
index d1d41af..9947de0 100644
--- a/lib/util-chroot.sh
+++ b/lib/util-chroot.sh
@@ -46,11 +46,8 @@ subvolume_delete_recursive() {
 
 create_chroot(){
     local timer=$(get_timer)
-#     local dest="$1"
-#     prepare_dir "$dest"
     setarch "${target_arch}" \
-        mkchroot "$@" || abort
-
+        mkchroot "$@"
     show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 6472e97..bbff271 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -283,7 +283,7 @@ make_image_root() {
 
         prepare_dir "${rootfs}"
 
-        create_chroot "${mkchroot_args[@]}" "${rootfs}" "${packages[@]}" || die
+        create_chroot "${mkchroot_args[@]}" "${rootfs}" "${packages[@]}"
 
         pacman -Qr "${rootfs}" > "${rootfs}/rootfs-pkgs.txt"
         copy_overlay "${profile_dir}/root-overlay" "${rootfs}"
@@ -307,7 +307,7 @@ make_image_desktop() {
 
         mount_fs_root "${desktopfs}"
 
-        create_chroot "${mkchroot_args[@]}" "${desktopfs}" "${packages[@]}" || die
+        create_chroot "${mkchroot_args[@]}" "${desktopfs}" "${packages[@]}"
 
         pacman -Qr "${desktopfs}" > "${desktopfs}/desktopfs-pkgs.txt"
         cp "${desktopfs}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
@@ -340,7 +340,7 @@ make_image_live() {
 
         mount_fs_select "${livefs}"
 
-        create_chroot "${mkchroot_args[@]}" "${livefs}" "${packages[@]}" || die
+        create_chroot "${mkchroot_args[@]}" "${livefs}" "${packages[@]}"
 
         pacman -Qr "${livefs}" > "${livefs}/livefs-pkgs.txt"
         copy_overlay "${profile_dir}/live-overlay" "${livefs}"