grub-devel.gnu.org archive mirror
 help / color / mirror / Atom feed
From: Lars Wendler <polynomial-c@gentoo.org>
To: grub-devel@gnu.org
Cc: mgorny@gentoo.org, Lars Wendler <polynomial-c@gentoo.org>
Subject: [PATCH] grub-mkconfig: only use scripts that are executable
Date: Thu, 19 Dec 2013 14:09:56 +0100	[thread overview]
Message-ID: <1387458596-3824-1-git-send-email-polynomial-c@gentoo.org> (raw)

commit ec824e0f2a399ce2ab3a2e3353d372a236595059 breaks grub-mkconfig if one of 
the pre-defined config files are not executable.

This patch fixes https://bugs.gentoo.org/494716

Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 util/grub-mkconfig.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 0ca0db1..fe33092 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -260,10 +260,12 @@ for i in "${grub_mkconfig_dir}"/* ; do
       | "${grub_mkconfig_dir}"/30_os-prober \
       | "${grub_mkconfig_dir}"/40_custom \
       | "${grub_mkconfig_dir}"/41_custom)
+          if test -x "$i" ; then
 	      echo
               echo "### BEGIN $i ###"
               "$i"
               echo "### END $i ###"
+          fi
       ;;
     # emacsen backup files. FIXME: support other editors
     *~) ;;
-- 
1.8.5.2



                 reply	other threads:[~2013-12-19 17:10 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=1387458596-3824-1-git-send-email-polynomial-c@gentoo.org \
    --to=polynomial-c@gentoo.org \
    --cc=grub-devel@gnu.org \
    --cc=mgorny@gentoo.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;
as well as URLs for NNTP newsgroup(s).