From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 12B251397EC for ; Wed, 19 Aug 2015 19:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E764BE0854; Wed, 19 Aug 2015 19:34:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9330FE0854 for ; Wed, 19 Aug 2015 19:34:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70CBA340968 for ; Wed, 19 Aug 2015 19:34:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAAD2153 for ; Wed, 19 Aug 2015 19:34:06 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1440012770.065e3157be7c90a27f09bf7b96ae10943db8a0e3.zerochaos@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 065e3157be7c90a27f09bf7b96ae10943db8a0e3 X-VCS-Branch: master Date: Wed, 19 Aug 2015 19:34:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 40f46110-155d-4d6b-8e8e-349a9f241e91 X-Archives-Hash: 7d2ace02aac9381217e89fddecfd6a3e commit: 065e3157be7c90a27f09bf7b96ae10943db8a0e3 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Wed Aug 19 19:32:50 2015 +0000 Commit: Richard Farina gentoo org> CommitDate: Wed Aug 19 19:32:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=065e3157 fix test to check for execute bit when we plan to execute as noticed during review of the patch from haasn for btrfs, many tests were checking for file existance before trying to execute while checking for the execute bit makes a bit more sense. defaults/initrd.scripts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 4724b55..a07a408 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -935,7 +935,7 @@ startVolumes() { if [ "${USE_MDADM}" = '1' ] then - if [ -e '/sbin/mdadm' ] + if [ -x '/sbin/mdadm' ] then /sbin/mdadm --assemble --scan else @@ -955,7 +955,7 @@ startVolumes() { if [ "${USE_DMRAID_NORMAL}" = '1' ] then - if [ -e '/sbin/dmraid' ] + if [ -x '/sbin/dmraid' ] then good_msg "Activating Device-Mapper RAID(s)" if [ '${DMRAID_OPTS}' = '' ] @@ -969,7 +969,7 @@ startVolumes() { if [ "${USE_LVM_NORMAL}" = '1' ] then - if [ -e '/bin/lvm' ] + if [ -x '/bin/lvm' ] then for dev in ${RAID_DEVICES} do @@ -1232,7 +1232,7 @@ openLUKS() { fi # At this point a candidate key exists (either mounted before or not) good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT} - if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then + if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -x /sbin/gpg ] ; then [ -e /dev/tty ] && mv /dev/tty /dev/tty.org mknod /dev/tty c 5 1 cryptsetup_options="${cryptsetup_options} -d -"