From 3f1c9d2fad412a34b2fb250a6940ccd67263b502 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 7 May 2023 17:01:11 +0200
Subject: [PATCH] remove init initramdisk if not requested in archboot-*-iso.sh

---
 usr/lib/archboot/iso.sh     |  6 +++++-
 usr/lib/archboot/release.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh
index 0c13f0ca9..02922092f 100644
--- a/usr/lib/archboot/iso.sh
+++ b/usr/lib/archboot/iso.sh
@@ -15,6 +15,7 @@ _usage () {
     echo "                     /etc/archboot/presets locates the presets"
     echo "                     default=${_ARCH}"
     echo " -i=IMAGENAME        Your IMAGENAME."
+    echo " -s                  Save init ramdisk to $(pwd)"
     echo " -h                  This message."
     echo ""
     echo "usage: ${_BASENAME} <options>"
@@ -25,6 +26,7 @@ _parameters() {
     while [ $# -gt 0 ]; do
         case ${1} in
             -g|--g) export _GENERATE="1" ;;
+            -s|--s) _SAVE_INIT="1" ;;
             -p=*|--p=*) _PRESET="$(echo "${1}" | awk -F= '{print $2;}')" ;;
             -i=*|--i=*) _IMAGENAME="$(echo "${1}" | awk -F= '{print $2;}')" ;;
             -h|--h|?) _usage ;;
@@ -71,7 +73,9 @@ _prepare_kernel_initramfs_files() {
         echo "Running archboot-cpio.sh for init-${_ARCH}.img..."
         archboot-cpio.sh -c "/etc/archboot/${_ARCH}-init.conf" -k "${ALL_kver}" -g "${_ISODIR}/boot/init-${_ARCH}.img" || exit 1
         # save init ramdisk for further images
-        cp "${_ISODIR}/boot/init-${_ARCH}.img" ./
+        if [[ -n "${_SAVE_INIT}" ]]; then
+            cp "${_ISODIR}/boot/init-${_ARCH}.img" ./
+        fi
     fi
     echo "Running archboot-cpio.sh for initramfs-${_ARCH}.img..."
     #shellcheck disable=SC2154
diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh
index 7a7c3bf57..b37469be0 100644
--- a/usr/lib/archboot/release.sh
+++ b/usr/lib/archboot/release.sh
@@ -43,19 +43,19 @@ _create_iso() {
         ${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>/dev/null
         echo "Generating local ISO..."
         # generate local iso in container
-        ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -p=${_PRESET_LOCAL} \
-        -i=${_ISONAME}-local-${_ARCH}" || exit 1
+        ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -s \
+            -p=${_PRESET_LOCAL}  -i=${_ISONAME}-local-${_ARCH}" || exit 1
         echo "Generating latest ISO..."
         # generate latest iso in container
-        ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -p=${_PRESET_LATEST} \
-        -i=${_ISONAME}-latest-${_ARCH}" || exit 1
+        ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g \
+            -p=${_PRESET_LATEST} -i=${_ISONAME}-latest-${_ARCH}" || exit 1
         echo "Installing lvm2 to container ${_W_DIR}..."
         ${_NSPAWN} "${_W_DIR}" pacman -Sy lvm2 --noconfirm &>/dev/null
     fi
     echo "Generating normal ISO..."
     # generate iso in container
     ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;archboot-${_ARCH}-iso.sh -g \
-    -i=${_ISONAME}-${_ARCH}"  || exit 1
+        -i=${_ISONAME}-${_ARCH}"  || exit 1
     # move iso out of container
     mv "${_W_DIR}"/*.iso ./ &>/dev/null
     mv "${_W_DIR}"/*.img ./ &>/dev/null