[gentoo-commits] gentoo-x86 commit in sys-boot/grub/files: grub-2.02_beta1-only-use-scripts-that-are-executable.patch

[Lars Wendler (polynomial-c)]

polynomial-c    13/12/23 20:56:21

  Added:               
                        grub-2.02_beta1-only-use-scripts-that-are-executable.patch
  Log:
  Let grub-mkconfig only use scripts that are executable (bug #494716)
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.1                  sys-boot/grub/files/grub-2.02_beta1-only-use-scripts-that-are-executable.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.02_beta1-only-use-scripts-that-are-executable.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.02_beta1-only-use-scripts-that-are-executable.patch?rev=1.1&content-type=text/plain

Index: grub-2.02_beta1-only-use-scripts-that-are-executable.patch
===================================================================
From b8ff36598b7c77d85984b5cb6b5f95a0b679dd52 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@g.o>
Date: Thu, 19 Dec 2013 14:04:23 +0100
Subject: [PATCH] grub-mkconfig: only use scripts that are executable

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@g.o>
---
 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