From 68c4a39c374085db91332e6dcbbe7ccbb85b59a6 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 18 Jun 2022 21:20:42 +0200
Subject: [PATCH] Merging Debian /firmware directories like the /pool
 directories

---
 test/merge_debian_isos     |  21 +++++++++++++++++++++
 test/merge_debian_isos.sig | Bin 72 -> 72 bytes
 2 files changed, 21 insertions(+)

diff --git a/test/merge_debian_isos b/test/merge_debian_isos
index 0c88523e..7d942179 100755
--- a/test/merge_debian_isos
+++ b/test/merge_debian_isos
@@ -732,8 +732,29 @@ do
   fi
 done
 
+for mount_point in $MOUNT_LIST
+do
+  if test "$mount_point" = "$mount_point_1"
+  then
+    if test -d "${mount_point}/firmware"
+    then
+      echo \
+    "Planned as imported /firmware        : ${mount_point}/firmware" >&2
+    fi
+  else
+    if test -d "${mount_point}/firmware"
+    then
+      echo \
+    "Planned for merging into /firmware   : ${mount_point}/firmware" >&2
+      echo " -map ${mount_point}/firmware /firmware" >>temp_file
+    fi
+  fi
+done
+
 if test "$XORRISO" = dummy
 then
+  echo "Planned xorriso commands in temp_file:" >&2
+  cat temp_file
   echo >&2
   echo 'NOTE: Variable XORRISO is set to "dummy".' >&2
   echo '      Will not perform xorriso run but only show its arguments:' >&2
diff --git a/test/merge_debian_isos.sig b/test/merge_debian_isos.sig
index b9f6e81779f35ba1702394859add494082fe6b33..219de15f3098d5a31f2f344090e4834881a4ecea 100644
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0%EQkdH@Ou5b4X`z^lNhROJ5voe^G;%c#S$I<G-Cjk>c<
eLd&N(Zvdc`8F^1ssgFhH>+U7Cve!C%WDYI+rXM~4

literal 72
zcmV-O0Jr~$Mg#y60ssaD0%EP}WB>{Y5b4X`z^lNhR9Ni*pLo0a34RZw(3tY2c8;#c
eMpLX%Rsf)eh@4fzegFu~OjPUKuBuXUkLxumD<HuD