From fcfafacc7cae547645f4d3afb77ea4b972fab64b Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 18 Dec 2024 22:49:32 +0100
Subject: [PATCH] Introduce architecture specific boot addon templates

We redesigned grml-live-grml in
https://github.com/grml/grml-live-grml/pull/11 to ship architecture
specific boot addon templates. This should simplify our life by being
able to ship files under identical names on all supported architectures.
---
 grml-live | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/grml-live b/grml-live
index 76c9a3ed..578e48f9 100755
--- a/grml-live
+++ b/grml-live
@@ -1274,10 +1274,23 @@ else
     fi
 
     # copy only files so we can handle bsd4grml on its own
-    for file in "${TEMPLATE_DIRECTORY}"/boot/addons/* ; do
-      test -f "$file" && cp "$file" "$BUILD_OUTPUT"/boot/addons/
-    done
-
+    if [ -d "${TEMPLATE_DIRECTORY}/arch/${ARCH}/boot/addons" ] ; then
+      for file in "${TEMPLATE_DIRECTORY}/arch/${ARCH}/boot/addons/"* ; do
+        if [ -f "$file" ] ; then
+          log   "Installing $file in /boot/addons."
+          einfo "Installing $file in /boot/addons."; eend 0
+          cp "$file" "$BUILD_OUTPUT"/boot/addons/
+        fi
+      done
+    else # legacy path (before https://github.com/grml/grml-live-grml/pull/11):
+      for file in "${TEMPLATE_DIRECTORY}"/boot/addons/* ; do
+        if [ -f "$file" ] ; then
+          log   "Installing $file in /boot/addons. (Legacy support)"
+          einfo "Installing $file in /boot/addons. (Legacy support)"; eend 0
+          cp "$file" "$BUILD_OUTPUT"/boot/addons/
+        fi
+      done
+    fi
     eend 0
 
     if [ -n "$NO_ADDONS_BSD4GRML" ] ; then