From b0618900ff8252d9a198ce4c2e19e831c910e094 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 17 Jan 2022 11:16:53 +0100
Subject: [PATCH] remove volid not working, fix mktemp

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

diff --git a/usr/bin/archboot-aarch64-iso.sh b/usr/bin/archboot-aarch64-iso.sh
index 512e7bb6b..9aebad02b 100755
--- a/usr/bin/archboot-aarch64-iso.sh
+++ b/usr/bin/archboot-aarch64-iso.sh
@@ -301,7 +301,7 @@ echo "Prepare UEFI image ..."
 _prepare_uefi_image >/dev/null 2>&1
 
 ## Generate the BIOS+ISOHYBRID+UEFI CD image using xorriso (extra/libisoburn package) in mkisofs emulation mode
-grub-mkrescue --compress=xz --fonts="unicode" --locales="" --themes="" -o "${_IMAGENAME}.iso" -volid "Arch Linux ARCHBOOT ${_RELEASENAME}" -preparer "prepared by ${_BASENAME}" "${_AARCH64}"/  &> "${_IMAGENAME}.log"
+grub-mkrescue --compress=xz --fonts="unicode" --locales="" --themes="" -o "${_IMAGENAME}.iso" "${_AARCH64}"/  &> "${_IMAGENAME}.log"
 
 ## create sha256sums.txt
 echo "Generating sha256sum ..."
diff --git a/usr/bin/archboot-aarch64-release.sh b/usr/bin/archboot-aarch64-release.sh
index 960823f24..2459c9ea3 100755
--- a/usr/bin/archboot-aarch64-release.sh
+++ b/usr/bin/archboot-aarch64-release.sh
@@ -3,7 +3,7 @@
 
 _BASENAME="$(basename "${0}")"
 _PRESET_LATEST="aarch64-latest"
-_W_DIR="$(mktemp -d archboot-release.XXX)"
+_W_DIR="$(mktemp -u archboot-release.XXX)"
 
 usage () {
 	echo "CREATE ARCHBOOT RELEASE IMAGE"
diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh
index d63519ffa..f57be9160 100755
--- a/usr/bin/archboot-x86_64-iso.sh
+++ b/usr/bin/archboot-x86_64-iso.sh
@@ -431,7 +431,7 @@ _prepare_uefi_image >/dev/null 2>&1
 
 ## Generate the BIOS+ISOHYBRID+UEFI CD image using xorriso (extra/libisoburn package) in mkisofs emulation mode
 echo "Generating X86_64 hybrid ISO ..."
-grub-mkrescue --compress="xz" --fonts="unicode" --locales="" --themes="" -o "${_IMAGENAME}.iso" -volid "Arch Linux ARCHBOOT ${_RELEASENAME}" -preparer "prepared by ${_BASENAME}" "${_X86_64}"/  &> "${_IMAGENAME}.log"
+grub-mkrescue --compress="xz" --fonts="unicode" --locales="" --themes="" -o "${_IMAGENAME}.iso" "${_X86_64}"/  &> "${_IMAGENAME}.log"
 
 ## create sha256sums.txt
 echo "Generating sha256sum ..."
diff --git a/usr/bin/archboot-x86_64-release.sh b/usr/bin/archboot-x86_64-release.sh
index af2a439f9..521af664a 100755
--- a/usr/bin/archboot-x86_64-release.sh
+++ b/usr/bin/archboot-x86_64-release.sh
@@ -3,7 +3,7 @@
 
 _BASENAME="$(basename "${0}")"
 _PRESET_LATEST="x86_64-latest"
-_W_DIR="$(mktemp -d archboot-release.XXX)"
+_W_DIR="$(mktemp -u archboot-release.XXX)"
 
 usage () {
 	echo "CREATE ARCHBOOT RELEASE IMAGE"