Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mztXk-0008R8-FL for mharc-grub-devel@gnu.org; Tue, 21 Dec 2021 23:48:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mztXi-0008R0-6F for grub-devel@gnu.org; Tue, 21 Dec 2021 23:47:58 -0500 Received: from [2607:f8b0:4864:20::f33] (port=39888 helo=mail-qv1-xf33.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mztXg-00051d-Qt for grub-devel@gnu.org; Tue, 21 Dec 2021 23:47:57 -0500 Received: by mail-qv1-xf33.google.com with SMTP id g15so1302468qvi.6 for ; Tue, 21 Dec 2021 20:47:55 -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=wgumf8qAL+DWHK2l26P4V5YVO+Atu767kgiQnMFvmgY=; b=p4cKuc+mAdKKvam1ysLv06DcVv9q8EM27RuxLtxQ1z4vYIaPJq9eMwBwf7Ls++9rxR lsX4f//xU0h5KtjAbE1kpuzaOqnJyP3tLDWI8a1xU8iLOTSdSQ8LifFqSTpKTyXp1YOJ Pirrg2G9r6O0t5ladhk8cjl+i4lEzynH0RYEsknXP4cjYQ64pb8Wz5/XYqbjpm0PfQMH TR1PL+BmLsGKzjLxtmdfYtbRsW1zrxX58c60UZrAPLrkvcLDasrpBBpBphhmuCtbI2D5 bk8AFHJLnT6iLkCxc6YzBpnX/aRAoXcPf5mLb+qBMuczgyNu1F4a9oPi4XeQDxgcvZWJ 8J/A== 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=wgumf8qAL+DWHK2l26P4V5YVO+Atu767kgiQnMFvmgY=; b=JMuYKS4aPG5AOcuMZE2HjJXXWPGYxMtNiooUoa18Y3RENHWnLisrmh+L7d7Pm4R4U1 nYh+JkML8L6o39hDVMf9T84k3WZuL0+0RAHKzYB61JiEVDGxA+AKTB+jQBwvQoiCQWWl HhHEJfia4fayghaeYfXkMSCa/7Z/wudMGHs0EXMA67pGZsnzZe7pwLzSl3vV0N/DsUaD 6iWf3etSDvuQ1io4KD878vDErDHVr5p9NWY1oUBi8NjDTLWNlmZx3kkAviJNj6RZle52 O75vWFSdsT7xleKG+wrc9g9FaXJGnD+0CIulAa+pFBeGNCy7pEzwIFcd7IWEdbpXD4E8 431A== X-Gm-Message-State: AOAM530twa6lBsdpGHyyps7TMHjH9K6JN4ZL0ZpHXtabaBpDKoQlffWA gjcUKsUgxChkQQmzaxyV+UhXOhr4yP13q4ew X-Google-Smtp-Source: ABdhPJz53nfU4E+dqmFOwZna8l80VYyFZDsGlKANwEQqqqpZtndbLjZ8ktFjVoNldAfD6yBI+AqxRQ== X-Received: by 2002:a05:6214:1c84:: with SMTP id ib4mr1243436qvb.76.1640148475313; Tue, 21 Dec 2021 20:47:55 -0800 (PST) Received: from Laptop-PC (pool-74-105-56-14.nwrknj.fios.verizon.net. [74.105.56.14]) by smtp.gmail.com with ESMTPSA id bj32sm902584qkb.75.2021.12.21.20.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 20:47:55 -0800 (PST) Received: (nullmailer pid 883111 invoked by uid 1000); Wed, 22 Dec 2021 04:47:54 -0000 From: Peter Levine To: grub-devel@gnu.org Cc: Peter Levine Subject: [PATCH] 30_os-prober: Properly handle multiple initrd paths Date: Tue, 21 Dec 2021 23:47:45 -0500 Message-Id: <20211222044745.883067-1-plevine457@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f33 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f33; envelope-from=plevine457@gmail.com; helo=mail-qv1-xf33.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Wed, 22 Dec 2021 04:47:58 -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. Closes 47681 Signed-off-by: Peter Levine --- 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.34.1