unblock request for dracut 059-4

[lange@debian.org]

Hi release team,

this is a unblock request for dracut 059-4.
This version is in unstable for 24 days.
Attached is the debdiff from 059-3 to 059-4

It fixes a wrong path in the debian patch
which closes #1029413 and #1030191
The debdiff is included after the diffstat

best regards Thomas



$ debdiff dracut_059-3.dsc dracut_059-4.dsc|diffstat
 changelog                          |    8 ++++++++
 patches/initrd-not-initramfs.patch |   14 +++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)




diff -Nru dracut-059/debian/changelog dracut-059/debian/changelog
--- dracut-059/debian/changelog	2023-01-09 20:56:29.000000000 +0100
+++ dracut-059/debian/changelog	2023-03-09 19:13:42.000000000 +0100
@@ -1,3 +1,11 @@
+dracut (059-4) unstable; urgency=low
+
+  * Fix file name in patch initrd-not-initramfs.patch
+    Closes: #1029413, #1030191
+    Thanks to nabijaczleweli for for the patch
+
+ -- Thomas Lange <lange@debian.org>  Thu, 09 Mar 2023 19:13:42 +0100
+
 dracut (059-3) unstable; urgency=low
 
   * control: add breaks + replaces, Closes: #1028303
diff -Nru dracut-059/debian/patches/initrd-not-initramfs.patch dracut-059/debian/patches/initrd-not-initramfs.patch
--- dracut-059/debian/patches/initrd-not-initramfs.patch	2022-12-26 12:51:37.000000000 +0100
+++ dracut-059/debian/patches/initrd-not-initramfs.patch	2023-03-09 18:09:34.000000000 +0100
@@ -16,7 +16,7 @@
              outfile="$dracutsysrootdir/lib/modules/${kernel}/initrd"
          elif [[ -e $dracutsysrootdir/boot/vmlinuz-${kernel} ]]; then
 -            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
-+            outfile="$dracutsysrootdir/boot/initrd-${kernel}"
++            outfile="$dracutsysrootdir/boot/initrd.img-${kernel}"
          elif [[ -z $dracutsysrootdir ]] \
              && [[ $MACHINE_ID ]] \
              && mountpoint -q /efi; then
@@ -25,7 +25,7 @@
              outfile="/boot/efi/${MACHINE_ID}/${kernel}/initrd"
          else
 -            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
-+            outfile="$dracutsysrootdir/boot/initrd-${kernel}"
++            outfile="$dracutsysrootdir/boot/initrd.img-${kernel}"
          fi
      fi
  fi
@@ -36,7 +36,7 @@
  _/boot/efi/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
  _/lib/modules/_++<kernel-version>++_/initrd_ or
 -_/boot/initramfs-_++<kernel-version>++_.img_ and contains the kernel modules of
-+_/boot/initrd-_++<kernel-version>++_ and contains the kernel modules of
++_/boot/initrd.img-_++<kernel-version>++_ and contains the kernel modules of
  the currently active kernel with version _++<kernel-version>++_.
  
  If the initramfs image already exists, dracut will display an error message, and
@@ -47,7 +47,7 @@
  _/boot/efi/<machine-id>/<kernel-version>/initrd_,
  _/lib/modules/<kernel-version>/initrd_ or
 -_/boot/initramfs-<kernel-version>.img_.
-+_/boot/initrd-<kernel-version>_.
++_/boot/initrd.img-<kernel-version>_.
  
  OPTIONS
  -------
@@ -59,8 +59,8 @@
          image="/lib/modules/${KERNEL_VERSION}/initramfs.img"
 -    elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
 -        image="/boot/initramfs-${KERNEL_VERSION}.img"
-+    elif [[ -f /boot/initrd-${KERNEL_VERSION} ]]; then
-+        image="/boot/initrd-${KERNEL_VERSION}"
++    elif [[ -f /boot/initrd.img-${KERNEL_VERSION} ]]; then
++        image="/boot/initrd.img-${KERNEL_VERSION}"
      elif [[ $MACHINE_ID ]] \
          && mountpoint -q /efi; then
          image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
@@ -73,7 +73,7 @@
 -elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
 -    IMG="/boot/initramfs-${KERNEL_VERSION}.img"
 +elif [[ -f /boot/initrd.img-${KERNEL_VERSION} ]]; then
-+    IMG="/boot/initrd-${KERNEL_VERSION}"
++    IMG="/boot/initrd.img-${KERNEL_VERSION}"
  elif mountpoint -q /efi; then
      IMG="/efi/$MACHINE_ID/$KERNEL_VERSION/initrd"
  elif mountpoint -q /boot/efi; then