From ca67b09c015d4af3ae3cce12aa72e60941dbb8b5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 18:29:52 +0200 Subject: Adding debian version 2.06-13+deb12u1. Signed-off-by: Daniel Baumann --- .../os-prober-Allow-initrd-to-contain-spaces.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch (limited to 'debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch') diff --git a/debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch b/debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch new file mode 100644 index 0000000..eb6c452 --- /dev/null +++ b/debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch @@ -0,0 +1,50 @@ +From 1f982e2a7c35e14d5a92c76db998afafd1bd9e87 Mon Sep 17 00:00:00 2001 +From: General Chaos +Date: Tue, 12 Apr 2016 22:28:52 +0000 +Subject: [PATCH] os-prober: Allow initrd to contain spaces + +linux-boot-prober produces structured output with newline-terminated rows +representing kernels, each with colon-delimited columns. We translate +this into a sequence of space-separated words representing kernels, +each containing colon-delimited fields where spaces are represented by +carets. + +When we parse each of those words into colon-delimited fields, if the +field could conceivably contain spaces then we need to translate +carets back into spaces. We did this for label and parameters, but not +for the initrd. + +In particular, when CPU microcode is installed on Arch Linux or its +derivatives, they write CPU microcode into one initrd archive and the +rest of early user-space into another, instead of concatenating the +archives into a single file like Debian derivatives do. To boot Arch +successfully from the grub menu, we need to add all of their initrds +to the grub menu entry (detecting this situation requires an os-prober +patch, for which see ). + +[Commit message added by Simon McVittie ] + +Bug: https://savannah.gnu.org/bugs/index.php?47681 +Bug-Debian: https://bugs.debian.org/838177 +Forwarded: https://savannah.gnu.org/bugs/index.php?47681 +Closes: #838177 +--- + util/grub.d/30_os-prober.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in +index da5f28876..d0609d9a4 100644 +--- a/util/grub.d/30_os-prober.in ++++ b/util/grub.d/30_os-prober.in +@@ -243,7 +243,7 @@ EOF + LBOOT="`echo ${LINUX} | cut -d ':' -f 2`" + LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`" + LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`" +- LINITRD="`echo ${LINUX} | cut -d ':' -f 5`" ++ LINITRD="`echo ${LINUX} | cut -d ':' -f 5 | tr '^' ' '`" + LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`" + + if [ -z "${LLABEL}" ] ; then +-- +2.32.0 + -- cgit v1.2.3