Now they're attached :v
From 727802bf80be4a3c817e52b5fc57868bcaf17999 Mon Sep 17 00:00:00 2001 Message-Id: <727802bf80be4a3c817e52b5fc57868bcaf17999.1675261799.git.nabijaczlew...@nabijaczleweli.xyz> From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz> Date: Wed, 1 Feb 2023 15:17:00 +0100 Subject: [PATCH 1/2] Fix d/p/initrd-not-initramfs.patch to point to /boot/initrd.img-$kver again (Closes: #1030191) X-Mutt-PGP: OS
This has been the case from the original version of this patch, for consistency with all other parts of Debian (and the normative kernel handbook: https://kernel-team.pages.debian.net/kernel-handbook/ch-packaging.html#s-arch-dep), but the confusing name meant it got refreshed to /boot/initrd-$kver --- debian/patches/initrd-not-initramfs.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/initrd-not-initramfs.patch b/debian/patches/initrd-not-initramfs.patch index 2c296372..ad456c3a 100644 --- a/debian/patches/initrd-not-initramfs.patch +++ b/debian/patches/initrd-not-initramfs.patch @@ -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 -- 2.39.1
From d00b69d601d09a23b6dca8c0fcc8200e97980a5b Mon Sep 17 00:00:00 2001
Message-Id: <d00b69d601d09a23b6dca8c0fcc8200e97980a5b.1675261799.git.nabijaczlew...@nabijaczleweli.xyz>
In-Reply-To: <727802bf80be4a3c817e52b5fc57868bcaf17999.1675261799.git.nabijaczlew...@nabijaczleweli.xyz>
References: <727802bf80be4a3c817e52b5fc57868bcaf17999.1675261799.git.nabijaczlew...@nabijaczleweli.xyz>
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz>
Date: Wed, 1 Feb 2023 15:20:25 +0100
Subject: [PATCH 2/2] d/p/initrd-not-initramfs.patch: rename to initrd.img
X-Mutt-PGP: OS
This has been a consistent source of confusion from the maintainer,
who updates the patch according to its filename, not according to the
message in the original commit 8ffe423532fa8950a422787d7f2acd11822b8015
Also, this matches the existing naming convention
---
debian/patches/{initrd-not-initramfs.patch => initrd.img} | 0
debian/patches/series | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename debian/patches/{initrd-not-initramfs.patch => initrd.img} (100%)
diff --git a/debian/patches/initrd-not-initramfs.patch b/debian/patches/initrd.img
similarity index 100%
rename from debian/patches/initrd-not-initramfs.patch
rename to debian/patches/initrd.img
diff --git a/debian/patches/series b/debian/patches/series
index 19828f40..b24bed0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@ makefile
vconsole
microcode
plymouth
-initrd-not-initramfs.patch
+initrd.img
--
2.39.1
signature.asc
Description: PGP signature
