From bd253c55cbb09b8bc2c9a88e7e0d557916c710a1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 25 Feb 2023 14:14:58 +0100
Subject: Moving initramfs-tools files to subdirectory in debian tree.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/initramfs/scripts/local-block/mdadm      | 61 -------------------------
 debian/initramfs/scripts/local-bottom/mdadm     |  3 --
 debian/local/initramfs-tools/local-block/mdadm  | 61 +++++++++++++++++++++++++
 debian/local/initramfs-tools/local-bottom/mdadm |  3 ++
 debian/mdadm.install                            |  2 +-
 5 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100755 debian/initramfs/scripts/local-block/mdadm
 delete mode 100755 debian/initramfs/scripts/local-bottom/mdadm
 create mode 100755 debian/local/initramfs-tools/local-block/mdadm
 create mode 100755 debian/local/initramfs-tools/local-bottom/mdadm

diff --git a/debian/initramfs/scripts/local-block/mdadm b/debian/initramfs/scripts/local-block/mdadm
deleted file mode 100755
index 214f24c..0000000
--- a/debian/initramfs/scripts/local-block/mdadm
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-PREREQ="multipath"
-
-prereqs()
-{
-	echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-. /scripts/functions
-
-# Poor man's mdadm-last-resort@.timer
-# That kicks in 2/3rds into the ROOTDELAY
-
-if [ ! -f /run/count.mdadm.initrd ]
-then
-    COUNT=0
-
-    # Unfortunately raid personalities can be registered _after_ block
-    # devices have already been added, and their rules processed, try
-    # triggering again.  See #830770
-    udevadm trigger --action=add -s block || true
-    wait_for_udev 10
-else
-    COUNT=$(cat /run/count.mdadm.initrd)
-fi
-COUNT=$((COUNT + 1))
-
-echo $COUNT > /run/count.mdadm.initrd
-
-# Run pure assemble command, even though we default to incremental
-# assembly it is supported for users to export variables via
-# param.conf such as IMSM_NO_PLATFORM.  See #830300
-mdadm -q --assemble --scan --no-degraded || true
-
-MAX=30
-if [ ${ROOTDELAY:-0} -gt $MAX ]; then
-    MAX=$ROOTDELAY
-fi
-MAX=$((MAX*2/3))
-
-if [ "$COUNT" = "$MAX" ]
-then
-    # Poor man's mdadm-last-resort@.service for incremental devices
-    mdadm -q --run /dev/md?*
-
-    # And last try for all others
-    mdadm -q --assemble --scan --run
-
-    rm -f /run/count.mdadm.initrd
-fi
-
-exit 0
diff --git a/debian/initramfs/scripts/local-bottom/mdadm b/debian/initramfs/scripts/local-bottom/mdadm
deleted file mode 100755
index eda3b17..0000000
--- a/debian/initramfs/scripts/local-bottom/mdadm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -f /run/count.mdadm.initrd
-exit 0
\ No newline at end of file
diff --git a/debian/local/initramfs-tools/local-block/mdadm b/debian/local/initramfs-tools/local-block/mdadm
new file mode 100755
index 0000000..214f24c
--- /dev/null
+++ b/debian/local/initramfs-tools/local-block/mdadm
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+PREREQ="multipath"
+
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+. /scripts/functions
+
+# Poor man's mdadm-last-resort@.timer
+# That kicks in 2/3rds into the ROOTDELAY
+
+if [ ! -f /run/count.mdadm.initrd ]
+then
+    COUNT=0
+
+    # Unfortunately raid personalities can be registered _after_ block
+    # devices have already been added, and their rules processed, try
+    # triggering again.  See #830770
+    udevadm trigger --action=add -s block || true
+    wait_for_udev 10
+else
+    COUNT=$(cat /run/count.mdadm.initrd)
+fi
+COUNT=$((COUNT + 1))
+
+echo $COUNT > /run/count.mdadm.initrd
+
+# Run pure assemble command, even though we default to incremental
+# assembly it is supported for users to export variables via
+# param.conf such as IMSM_NO_PLATFORM.  See #830300
+mdadm -q --assemble --scan --no-degraded || true
+
+MAX=30
+if [ ${ROOTDELAY:-0} -gt $MAX ]; then
+    MAX=$ROOTDELAY
+fi
+MAX=$((MAX*2/3))
+
+if [ "$COUNT" = "$MAX" ]
+then
+    # Poor man's mdadm-last-resort@.service for incremental devices
+    mdadm -q --run /dev/md?*
+
+    # And last try for all others
+    mdadm -q --assemble --scan --run
+
+    rm -f /run/count.mdadm.initrd
+fi
+
+exit 0
diff --git a/debian/local/initramfs-tools/local-bottom/mdadm b/debian/local/initramfs-tools/local-bottom/mdadm
new file mode 100755
index 0000000..eda3b17
--- /dev/null
+++ b/debian/local/initramfs-tools/local-bottom/mdadm
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -f /run/count.mdadm.initrd
+exit 0
\ No newline at end of file
diff --git a/debian/mdadm.install b/debian/mdadm.install
index abad9e1..035c133 100644
--- a/debian/mdadm.install
+++ b/debian/mdadm.install
@@ -4,5 +4,5 @@ lib/
 misc/mdcheck usr/share/mdadm/
 
 debian/local/bin/* usr/share/mdadm
-debian/initramfs/* usr/share/initramfs-tools/
+debian/local/initramfs-tools/* usr/share/initramfs-tools/scripts
 debian/bug-submission/script usr/share/bug/mdadm/
-- 
cgit v1.2.3