public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Leo Sandoval <lsandova@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/grub2] rawhide: spec efi postttrans: remove mountpoint check
Date: Thu, 25 Jun 2026 19:58:03 GMT	[thread overview]
Message-ID: <178241748348.1.1668702612006218969.rpms-grub2-f1a0e40dbd03@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/grub2
            Branch : rawhide
            Commit : f1a0e40dbd038980a073fca1c342a3f29ef9bbec
            Author : Leo Sandoval <lsandova@redhat.com>
            Date   : 2026-06-25T13:06:13-06:00
            Stats  : +10/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/grub2/c/f1a0e40dbd038980a073fca1c342a3f29ef9bbec?branch=rawhide

            Log:
            spec efi postttrans: remove mountpoint check

GRUB is not always installed on running systems, e.g wiki, lorax, so
mount point checking makes little sense on these environments. Remove
this check completely and copy .efi|.cfg files in any case.

Resolves: #2492140
Resolves: #2491171

Signed-off-by: Leo Sandoval <lsandova@redhat.com>

---
diff --git a/grub2.spec b/grub2.spec
index 8665d22..8fa47b5 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.12
-Release:	65%{?dist}
+Release:	66%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
@@ -436,12 +436,10 @@ fi
 
 # On image mode, bootupd takes care of installing bootloader updates to the ESP
 if [[ ! -e "/run/ostree-booted" ]]; then
-   # Check if /boot/efi is actually mounted before cp
-   if ! mountpoint -q ${ESP_PATH}; then
-       : # no ESP mounted, nothing to do
-   else
-     cp -a ${EFI_DIR}/. ${EFI_ESP_DIR} || :
-   fi
+   # Note that cp -R is not indicated because CC binaries are
+   # located in a EFI_DIR subfolder and we do not want to copy
+   # these into the ESP
+   cp -d --preserve=all ${EFI_DIR}/* ${EFI_ESP_DIR} || :
 fi
 
 if test -f ${EFI_DIR}/grubenv; then
@@ -627,6 +625,11 @@ fi
 %endif
 
 %changelog
+* Thu Jun 25 2026 Leo Sandoval <lsandova@redhat.com> - 2.12-66
+- spec efi postttrans: remove mountpoint check
+- Resolves: #2492140
+- Resolves: #2491171
+
 * Mon Jun 15 2026 Leo Sandoval <lsandova@redhat.com> - 2.12-65
 - spec: always exit with zero status on common posttrans scriptlet
 

                 reply	other threads:[~2026-06-25 19:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178241748348.1.1668702612006218969.rpms-grub2-f1a0e40dbd03@fedoraproject.org \
    --to=lsandova@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox