From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nYgGD-0005sl-Cm for mharc-grub-devel@gnu.org; Sun, 27 Mar 2022 23:41:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYgGB-0005rr-Ac for grub-devel@gnu.org; Sun, 27 Mar 2022 23:41:39 -0400 Received: from [2a00:1450:4864:20::136] (port=43007 helo=mail-lf1-x136.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYgG9-0006Ir-LJ for grub-devel@gnu.org; Sun, 27 Mar 2022 23:41:38 -0400 Received: by mail-lf1-x136.google.com with SMTP id d5so22530050lfj.9 for ; Sun, 27 Mar 2022 20:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:mime-version :content-disposition; bh=4r8lqeJc2oVrTfsD4eEnkj6c5oJ5eSBYzWw0yhxRrn8=; b=Y0izHGL68UBtvGywC/bg00fksDMLzbb50VK4oQAPHcSBYkz9244B2QSmwYbLQ6B6Ft pBwhblV+l8A2yzjJh8Gme+gDdDB18ygLL0WjV7ZkJCh3xYjrnrDqEVn14fKJxkZzucjV vdpdL3Udj42br6oOggL9HoydN07EiVBULrnQZQX49x0F9LQlTMH60RnsgL4ExlzSlP2j pjc43DBdq3M0/muTzK+URPsjjLD2P5dA2sLp67Ix7w4vLDbsecSi4rTIRiAUy9iLuupF iH0QNnKNU+rkPPjs1Fkcg0wxqX9aCga61u7VwVHJ+tB8Aa9wH6UVqrz2X6fCDf6/pO2m cD2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :mime-version:content-disposition; bh=4r8lqeJc2oVrTfsD4eEnkj6c5oJ5eSBYzWw0yhxRrn8=; b=l2Uy/3ccJZYq6SCJwCDN+EUdIUCCkbD+jY5m6WGSH6m0lvttXZBVSDscLS6tQWnYo+ G9YI/omMcTXQLpW1L1B0362ny84iv0S9XKANq9noTsVROAZdsKl9/h/nHwbI8TPjuHOx MqZczLCaasbdRJ8U59fsLiD7obOsuaXWY10XXpJ7BKTkIN8IeXlLuRfpHiQpTgbzW16I 0ixbHkOFQ9zA8eG4++3xsXfFhcqiEtn1N81m0S+Tr2sLcKmx+v0FaBpKWRPviS5gVGlk ikfUPBgjPUF+ZpFE9UGuh22TzKW7IhVe1hydOCv9UeDcMOVZVvkp8AVA1ly9QIWL+qY4 G07w== X-Gm-Message-State: AOAM532kmNr80Os+vAdPE6xopviMsipj7iiJ9kNM6cv9M0kQTr7Qnjjo oicCTGEsx5sbXkoUcibg1HOJk8i+nDk= X-Google-Smtp-Source: ABdhPJxQPOyCb6Km+LKe8rc2MVY3mZkOcWNYmnLeAx/swTkQpBS5r2Ifvnhx7a9CTOVtDbsHvp3qCA== X-Received: by 2002:a05:6512:314b:b0:44a:3751:9f0d with SMTP id s11-20020a056512314b00b0044a37519f0dmr17854764lfi.267.1648438895610; Sun, 27 Mar 2022 20:41:35 -0700 (PDT) Received: from dj3ntoo (229.sub-72-104-162.myvzw.com. [72.104.162.229]) by smtp.gmail.com with ESMTPSA id h23-20020a056512339700b0044a15d1c6adsm1512385lfg.26.2022.03.27.20.41.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 20:41:35 -0700 (PDT) Date: Sun, 27 Mar 2022 22:41:31 -0500 From: Oskari Pirhonen To: grub-devel@gnu.org Subject: [PATCH v2] util/grub.d/linux: Improve initramfs detection Message-ID: Mail-Followup-To: grub-devel@gnu.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::136 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=xxc3ncoredxx@gmail.com; helo=mail-lf1-x136.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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_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: Mon, 28 Mar 2022 03:41:39 -0000 Add detection for initramfs of the form *.img.old. For example, Gentoo's sys-kernel/genkernel installs it as initramfs-*.img and moves any existing one to initramfs-*.img.old. Signed-off-by: Oskari Pirhonen --- v1 -> v2: - don't reorder the checks - include 20_linux_xen.in util/grub.d/10_linux.in | 17 +++++++++-------- util/grub.d/20_linux_xen.in | 29 +++++++++++++++-------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index ca068038e..cb049e943 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -215,14 +215,15 @@ while [ "x$list" != "x" ] ; do done initrd_real= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do + for i in "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${alt_version}.img.old" "initrd-${version}.gz" \ + "initrd-${alt_version}.gz.old" "initrd-${version}" \ + "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do if test -e "${dirname}/${i}" ; then initrd_real="${i}" break diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index f45559ff8..5a1b7b7d4 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -283,20 +283,21 @@ while [ "x${xen_list}" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - initrd_real= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" ; do - if test -e "${dirname}/${i}" ; then - initrd_real="$i" - break - fi - done + initrd_real= + for i in "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${alt_version}.img.old" "initrd-${version}.gz" \ + "initrd-${alt_version}.gz.old" "initrd-${version}" \ + "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do + if test -e "${dirname}/${i}" ; then + initrd_real="${i}" + break + fi + done initrd= if test -n "${initrd_early}" || test -n "${initrd_real}"; then -- 2.34.1