Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nPdAX-0001EP-4M for mharc-grub-devel@gnu.org; Wed, 02 Mar 2022 23:34:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPdAV-0001Ds-Gb for grub-devel@gnu.org; Wed, 02 Mar 2022 23:34:24 -0500 Received: from [2607:f8b0:4864:20::f34] (port=40930 helo=mail-qv1-xf34.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPdAU-0007y5-4w for grub-devel@gnu.org; Wed, 02 Mar 2022 23:34:23 -0500 Received: by mail-qv1-xf34.google.com with SMTP id gm1so3246728qvb.7 for ; Wed, 02 Mar 2022 20:34:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MChPoQPfqxbx2sImjX3lZiuArfxmJxV+ioW2ZH96H9w=; b=XvratricMDv29JGjfHdTaZbZge9SH9K7SSS3S2O3GmAnV3AKvvafZqgwe7VNRd1tcX j+vq7bdq0Qm8DKQLeeIci0JMX21Xntgd31GELc5dnxvqEt2XsGfxlOKNQHZ85py3Z8X7 GeVEof76XCjylRkSaFTTjDIxwP8X7n65iAAvViJZUay9gwqTtxahAxC1YSnTVqdN0B89 RGXxFsishItVbydZtsTV5CTW6xGw4kp20yASt8bDCNr745eJ1nlwRsZaTDqV9AEJmEn9 pY9/OeaxhMAAKTNwhAAWIJM4X3Ej3h92R1nRDOoGI/H55vPjHsuuIRpwThHB9dc3Ggdp HLkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MChPoQPfqxbx2sImjX3lZiuArfxmJxV+ioW2ZH96H9w=; b=8EX4NJg2jlihnlGY8+HdNM3PVeDSKOx0bR0KwFR54UXqdjLVK4XDfP1Pp1gUq2KfmB lsm1JfKZIsRtTsorplLihXnB/oXZJWYdJAQp28YVJrysOKtGvnPvmlma6nuD4GCGuCOb zxtHyE5b3dSad6QyVl/zm8KsnczvleBaEX5w+vK6DYfD4Z8mxrDaQyOixGnYqnbIDcyU TGBluMHz4qa/EAQf1u1z/T4yc2NmQCF5sY3aXdfknPgFwlFX2nwBROmrpzkAsspPzhpg wLQ6qngVtQPPFOcLRmtcH9QpJfJr5YcbeGF2KHSD0AAkil+CE83SQJJ/UKFY/k02owAa 2+og== X-Gm-Message-State: AOAM533lARikb9DSv/TT1hzli8Btw+kq3L9XTC8HXIULp3g9S3v0Oy3j wQaB7M+TJp29SCwwq/+whCI+/B49wBs= X-Google-Smtp-Source: ABdhPJzH0SlL5KgaRNjgAUcqpLtmQs3Tr1NRdcD87GhnpnDYNHuIpGVNCopytTCHbSQBepkR0B/cAQ== X-Received: by 2002:ad4:5bc1:0:b0:42c:531c:ef12 with SMTP id t1-20020ad45bc1000000b0042c531cef12mr23225244qvt.15.1646282060722; Wed, 02 Mar 2022 20:34:20 -0800 (PST) Received: from Laptop-PC (pool-96-240-1-98.nwrknj.fios.verizon.net. [96.240.1.98]) by smtp.gmail.com with ESMTPSA id o13-20020ac87c4d000000b002dd2647f223sm769057qtv.42.2022.03.02.20.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 20:34:20 -0800 (PST) Received: (nullmailer pid 6739 invoked by uid 1000); Thu, 03 Mar 2022 04:34:19 -0000 From: Peter Levine To: grub-devel@gnu.org Cc: Peter Levine , Daniel Kiper Subject: [PATCH v3] 30_os-prober: Properly handle multiple initrd paths Date: Wed, 2 Mar 2022 23:34:06 -0500 Message-Id: <20220303043406.6723-1-plevine457@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f34 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f34; envelope-from=plevine457@gmail.com; helo=mail-qv1-xf34.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2022 04:34:24 -0000 os-prober now effectively handles multiple paths passed to initrd, but grub-mkconfig still truncates off any subsequent space-delimited paths. Support proper parsing of space-delimited initrd paths passed from os-prober for distributions, like Manjaro, that require it. Fixes: https://savannah.gnu.org/bugs/?47681 Signed-off-by: Peter Levine Reviewed-by: Daniel Kiper --- Changes in v2 - Add Fixes tag with URL. - Add Reviewed-by tag from Daniel Kiper. Changes in v3 - Fix quote completion error. 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 5984e92d2..daa603778 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -210,7 +210,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.35.1