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 5C552138A1A for ; Sat, 17 Jan 2015 23:39:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7EE6E09B6; Sat, 17 Jan 2015 23:39:47 +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 93F09E09B6 for ; Sat, 17 Jan 2015 23:39:47 +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 96F6B34067D for ; Sat, 17 Jan 2015 23:39:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E5A1FCDA for ; Sat, 17 Jan 2015 23:39:45 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1421513746.783374a7d24e310fcf0a49e16c10687bd515d66a.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: modules/, / X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog modules/rc.eselect X-VCS-Directories: / modules/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 783374a7d24e310fcf0a49e16c10687bd515d66a X-VCS-Branch: master Date: Sat, 17 Jan 2015 23:39:45 +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: be7ee296-f77d-4a0d-ae42-958f9064a079 X-Archives-Hash: f50b5cb8b0920614a192fda304c8ec66 commit: 783374a7d24e310fcf0a49e16c10687bd515d66a Author: Ulrich Müller gentoo org> AuthorDate: Sat Jan 17 16:55:46 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Jan 17 16:55:46 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=783374a7 Be compatible with new OpenRC in rc module. * modules/rc.eselect: Be compatible with new OpenRC, bug 536822. (is_script): Test for "openrc-run" or "runscript" in shebang line. (run_runscript): Omit the interpreter when executing the script. --- ChangeLog | 6 ++++++ modules/rc.eselect | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b27214b..01b8d14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-01-17 Ulrich Müller + + * modules/rc.eselect: Be compatible with new OpenRC, bug 536822. + (is_script): Test for "openrc-run" or "runscript" in shebang line. + (run_runscript): Omit the interpreter when executing the script. + 2014-09-01 Ulrich Müller * configure.ac: Update version to 1.4.3. diff --git a/modules/rc.eselect b/modules/rc.eselect index 82eb6ef..2a9bf5b 100644 --- a/modules/rc.eselect +++ b/modules/rc.eselect @@ -37,7 +37,7 @@ is_script() { && ${file%%.sh} = ${file} \ && ${file%%\~} = ${file} \ && -e ${file} ]] \ - && grep "^#\!/sbin/runscript" "${file}" &>/dev/null + && grep '^#!.*/\(runscript\|openrc-run\)' "${file}" &>/dev/null } # find_scripts PRIVATE @@ -92,7 +92,7 @@ run_runscript() { shift for script; do is_script "${EROOT}/etc/init.d/${script}" \ - && /sbin/runscript "${EROOT}/etc/init.d/${script}" "${command}" + && "${EROOT}/etc/init.d/${script}" "${command}" done }