From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/eselect:master commit in: modules/, /
Date: Sat, 17 Jan 2015 23:39:45 +0000 (UTC) [thread overview]
Message-ID: <1421513746.783374a7d24e310fcf0a49e16c10687bd515d66a.ulm@gentoo> (raw)
commit: 783374a7d24e310fcf0a49e16c10687bd515d66a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 17 16:55:46 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm@gentoo.org>
+
+ * 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 <ulm@gentoo.org>
* 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
}
next reply other threads:[~2015-01-17 23:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-17 23:39 Ulrich Müller [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-05-06 13:24 [gentoo-commits] proj/eselect:master commit in: modules/, / Ulrich Müller
2018-01-09 8:32 Ulrich Müller
2019-02-13 20:51 Ulrich Müller
2019-05-26 15:30 Ulrich Müller
2020-04-23 12:42 Ulrich Müller
2021-02-19 13:33 Ulrich Müller
2021-10-24 10:04 Ulrich Müller
2022-01-07 14:11 Ulrich Müller
2023-09-09 19:00 [gentoo-commits] proj/eselect:bug643864 " Ulrich Müller
2023-09-11 16:32 ` [gentoo-commits] proj/eselect:master " Ulrich Müller
2025-02-02 14:35 Ulrich Müller
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=1421513746.783374a7d24e310fcf0a49e16c10687bd515d66a.ulm@gentoo \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.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