Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nMjN1-00073i-2Y for mharc-grub-devel@gnu.org; Tue, 22 Feb 2022 23:35:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMjMx-0006xn-GZ for grub-devel@gnu.org; Tue, 22 Feb 2022 23:35:15 -0500 Received: from [2607:f8b0:4864:20::734] (port=43971 helo=mail-qk1-x734.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMjMv-00011h-WE for grub-devel@gnu.org; Tue, 22 Feb 2022 23:35:15 -0500 Received: by mail-qk1-x734.google.com with SMTP id z66so3134395qke.10 for ; Tue, 22 Feb 2022 20:35:13 -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=9L98PQ6xjVJKGTANiJ3XEhewwQXjJzRCbbfDpjU3de0=; b=IqlO1HQ8SoF0zab58f9kdxU59sm+a9kha8eQXu4yPasZXIovTajJ20Ksvb+NnMM1ah jhXgDqZJf1V9vcb5XAnKwRNR+IOwJxSjElf5UHJPYN31Wi908mENuRmBactW7eA+NibC J7GA/5JB6pwt4U7Ootr6O4v34+DZC7lGJwJqxGEv8nQstpeWS8xklHjA+McDcAW/nPib 7TuFtZKz1hhPSa5hOJxKL3RqIJD0RMqhy8WtAuZmt3MvA8t5jSh1YyIlzdftpUCWOR5n fC0jQWwpCUNFYKw0XTfXMirTxgJZ3sPoLEm+JQ0J6J826Cmktn7zHueATqiPN4V+sGBv JyTg== 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=9L98PQ6xjVJKGTANiJ3XEhewwQXjJzRCbbfDpjU3de0=; b=thzPMAg9QjVTQAmn7pO6elEPj3r9wFEDkdtctv9XZCxauOlUlHXYF/E11h4q2BN3gd 9yuvUlilGBPJpXossKEddNPNWXGnVGxpnNf75jdwqOMsFYIpViWN2MXLPPvvb95PZTl6 4YGejkN/EM2C+IgYvz3PcGrs3zNZZOro0hX6DPsLxUHFcSb9SnU8/kHXRgxLbw7eLQUk dYPAWXQceoBBQc0JGLedQcHSKbzqfn9LfQx+Rqi++2k2tDEQOYEqM7W/T9gOd4ktOMN/ gFue4hQgcaXKF5xRGQ1OQzKcAw5I2tO0HvAW9Tm5KgfSNqNgxJGy25aDQRPHQeFh4k6R qUvQ== X-Gm-Message-State: AOAM5325EqIGv4Li0qC6DuecpXja0VhLOJsV8GmubwPeqQto0751zSCp ZprM6oQP+8DUYigJH3JE8JO4sJADObo= X-Google-Smtp-Source: ABdhPJzNNmPK4U5qmFO/gF+Ov5vE1lkHfazcJeFjYdQn7yQHxVPmAqBj94bWFlJ0DHm0N1S/kO7OFA== X-Received: by 2002:ae9:de07:0:b0:477:87b8:12e4 with SMTP id s7-20020ae9de07000000b0047787b812e4mr17413314qkf.560.1645590912573; Tue, 22 Feb 2022 20:35:12 -0800 (PST) Received: from Laptop-PC (pool-72-90-157-192.nwrknj.east.verizon.net. [72.90.157.192]) by smtp.gmail.com with ESMTPSA id g11sm1448337qtg.49.2022.02.22.20.35.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 20:35:12 -0800 (PST) Received: (nullmailer pid 51434 invoked by uid 1000); Wed, 23 Feb 2022 04:35:11 -0000 From: Peter Levine To: grub-devel@gnu.org Cc: Peter Levine , Daniel Kiper Subject: [PATCH v2] 30_os-prober: Properly handle multiple initrd paths Date: Tue, 22 Feb 2022 23:35:02 -0500 Message-Id: <20220223043502.51417-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::734 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::734; envelope-from=plevine457@gmail.com; helo=mail-qk1-x734.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: Wed, 23 Feb 2022 04:35:15 -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. 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..f03199584 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