From 2dc03fb238ded20432e040882eb3847a25f46191 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 13 Jan 2022 16:58:38 +0100
Subject: [PATCH] add exit 1 on same points as on aarch64

---
 usr/bin/archboot-x86_64-iso.sh            | 1 -
 usr/bin/archboot-x86_64-release.sh        | 2 +-
 usr/bin/archboot-x86_64-server-release.sh | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh
index 318fd37cc..d39ee67d5 100755
--- a/usr/bin/archboot-x86_64-iso.sh
+++ b/usr/bin/archboot-x86_64-iso.sh
@@ -6,7 +6,6 @@ _X86_64="$(mktemp -d X86_64.XXX)"
 _SHIM_URL="https://kojipkgs.fedoraproject.org/packages/shim/15.4/5/x86_64"
 _SHIM_VERSION="shim-x64-15.4-5.x86_64.rpm"
 _SHIM32_VERSION="shim-ia32-15.4-5.x86_64.rpm"
-_LOG=""
 
 usage () {
 	echo "${_BASENAME}: usage"
diff --git a/usr/bin/archboot-x86_64-release.sh b/usr/bin/archboot-x86_64-release.sh
index 641ba5949..b98415d30 100755
--- a/usr/bin/archboot-x86_64-release.sh
+++ b/usr/bin/archboot-x86_64-release.sh
@@ -25,7 +25,7 @@ echo "Start release creation in $1 ..."
 mkdir -p $1
 cd $1
 # create container
-archboot-x86_64-create-container.sh "${_W_DIR}" -cc -cp -alf
+archboot-x86_64-create-container.sh "${_W_DIR}" -cc -cp -alf || exit 1
 # generate tarball in container, umount tmp it's a tmpfs and weird things could happen then
 echo "Generate ISO ..."
 systemd-nspawn -q -D "${_W_DIR}" /bin/bash -c "umount /tmp;archboot-x86_64-iso.sh -t -i=archrelease"
diff --git a/usr/bin/archboot-x86_64-server-release.sh b/usr/bin/archboot-x86_64-server-release.sh
index f1fc33e4d..2024b4694 100755
--- a/usr/bin/archboot-x86_64-server-release.sh
+++ b/usr/bin/archboot-x86_64-server-release.sh
@@ -32,7 +32,7 @@ cp "${_PACMAN_MIRROR}".archboot "${_PACMAN_MIRROR}"
 # create release in "${_BUILDDIR}"
 cd "${_BUILDDIR}"
 [[ -e "${_DIRECTORY}" ]] && rm -r "${_DIRECTORY}"
-archboot-"${_ARCH}"-release.sh "${_DIRECTORY}"
+archboot-"${_ARCH}"-release.sh "${_DIRECTORY}" || exit 1
 # set user rights on files
 chown -R "${_USER}" "${_DIRECTORY}"
 chgrp -R "${_GROUP}" "${_DIRECTORY}"