From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Vth6s-0004pn-4X for mharc-grub-devel@gnu.org; Thu, 19 Dec 2013 12:10:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtdMm-000858-CU for grub-devel@gnu.org; Thu, 19 Dec 2013 08:10:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtdMf-0002eh-Q6 for grub-devel@gnu.org; Thu, 19 Dec 2013 08:10:16 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:50170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtdMf-0002dr-KG for grub-devel@gnu.org; Thu, 19 Dec 2013 08:10:09 -0500 Received: from shanghai.paradoxon.rec (p4FDA906E.dip0.t-ipconnect.de [79.218.144.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: polynomial-c@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id AE54333F5A3; Thu, 19 Dec 2013 13:10:05 +0000 (UTC) From: Lars Wendler To: grub-devel@gnu.org Subject: [PATCH] grub-mkconfig: only use scripts that are executable Date: Thu, 19 Dec 2013 14:09:56 +0100 Message-Id: <1387458596-3824-1-git-send-email-polynomial-c@gentoo.org> X-Mailer: git-send-email 1.8.5.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.211.166.183 X-Mailman-Approved-At: Thu, 19 Dec 2013 12:10:04 -0500 Cc: mgorny@gentoo.org, Lars Wendler X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 13:10:23 -0000 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 --- 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