Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nUheC-00078y-E8 for mharc-grub-devel@gnu.org; Thu, 17 Mar 2022 00:22:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUheA-00078o-Om for grub-devel@gnu.org; Thu, 17 Mar 2022 00:21:58 -0400 Received: from [2a00:1450:4864:20::436] (port=44621 helo=mail-wr1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUhe9-00056W-70 for grub-devel@gnu.org; Thu, 17 Mar 2022 00:21:58 -0400 Received: by mail-wr1-x436.google.com with SMTP id b19so5625627wrh.11 for ; Wed, 16 Mar 2022 21:21:56 -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=ip3KWyoC+2zIbGfmwZ3VmXkPTYXTtFSV7cva/XrgBa8=; b=hOlpLMt9ZQn+GsaFXExjR+SC8bv4osLOhttWLudLlSpdiWu9trucIJ8XwKv1xhUZrv v2vtAk1QHwkjLbU+Op8nu/alj7WOH+EnQKteBbe0WTbFBY3z2RkAKesIyIZMPMKcS+DH NB2wdI0wRknBUt1UVsJ8VZxLGSc51zHehwmDMvKFDYC8Sqho+qpmAWUJX+gCVNLhnJDH 00ppFC95jCN3odppPw/lfGEkgSTvxaVnpCbLFpRzsK6x+hZFN0pK48kSTTQ1+XZW4V3e WAjAYJSTB/ui5xSdFLu3lFrbFFZkdCFnJc5D9Pf8bv3d0jPlkv5y7K9E0ouJbZ/4mV3l srEQ== 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=ip3KWyoC+2zIbGfmwZ3VmXkPTYXTtFSV7cva/XrgBa8=; b=p/+HCe8RJQZHlLysRJU/1VccbGriZcs0O6FyEVTyLU3GImADper236YQx1VGq51sip BMYCnaK3r6RqS8hXwSjlgNKDiiSP145wbIu+W5aVCuPoXq0xqebc1zlY/rMXTg84ye/R 7I49uRgbvevT+ML7fPX6lRDjE9y/9HGVO1lOA/QNogGKcrRxO4SYTUF+phZrw+cGnVas cDEb2YlIIpB/BEaFwl7GNyrek+NWAebsF7tuxtQ0vljolzFGtroJ4fTthI8iIYWtoMsA ZivO4fdbl7ac1JMDJiAkiuGvN+VZ4kK0kRbPxiGZEWF328OVKr912xPKkDvHDM4GfIxy cOFg== X-Gm-Message-State: AOAM533jHBgrZ/qB2M9SqzPkgY+giqY4R9xN7SFylTY7d5Ztnj1LV4I4 dizufLDRJHclf9ylhbSNa6gMEqboB5U= X-Google-Smtp-Source: ABdhPJwn6h7UmYCywiy54Vb4hZU8OvN5Bb9vBJ0m+/+KwT06j2UmLUIlOl7cycqF4nQ8XSm3ZSpbiw== X-Received: by 2002:a5d:55c3:0:b0:203:e392:54dc with SMTP id i3-20020a5d55c3000000b00203e39254dcmr2337241wrw.506.1647490915579; Wed, 16 Mar 2022 21:21:55 -0700 (PDT) Received: from dj3ntoo (229.sub-72-104-162.myvzw.com. [72.104.162.229]) by smtp.gmail.com with ESMTPSA id l12-20020a05600012cc00b001f059bcbd7asm2903567wrx.31.2022.03.16.21.21.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 21:21:55 -0700 (PDT) Date: Wed, 16 Mar 2022 23:21:51 -0500 From: Oskari Pirhonen To: grub-devel@gnu.org Subject: [PATCH] util/grub.d/10_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::436 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=xxc3ncoredxx@gmail.com; helo=mail-wr1-x436.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: Thu, 17 Mar 2022 04:21:59 -0000 Prefer using a *.old initramfs for *.old kernels if it exists. Otherwise look for an initramfs without the suffix. Also 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 --- util/grub.d/10_linux.in | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index ca068038e..4a666c317 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -215,19 +215,34 @@ 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 - if test -e "${dirname}/${i}" ; then - initrd_real="${i}" - break - fi - done + # Prefer to match *.old kernel with *.old initramfs if it exists + if [ "${alt_version}" != "${version}" ]; then + 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" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}"; do + if test -e "${dirname}/${i}" ; then + initrd_real="${i}" + break + fi + done + fi + + # alt_version == version or *.old initramfs not found + # use alt_version to handle both cases at once + if [ -z "${initrd_real}" ]; then + for i in "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}.gz" "initrd-${alt_version}" \ + "initramfs-${alt_version}.img" "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do + if test -e "${dirname}/${i}" ; then + initrd_real="${i}" + break + fi + done + fi initrd= if test -n "${initrd_early}" || test -n "${initrd_real}"; then -- 2.34.1