From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/openrc:master commit in: scripts/
Date: Tue, 11 Jul 2017 19:57:49 +0000 (UTC) [thread overview]
Message-ID: <1499802089.e7807b3136d8993805082320784460f5059e6275.williamh@OpenRC> (raw)
commit: e7807b3136d8993805082320784460f5059e6275
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 11 19:41:29 2017 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 19:41:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e7807b31
fix sysvinit compatibility for shutdown wrapper
scripts/shutdown.in | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/scripts/shutdown.in b/scripts/shutdown.in
index 69a4a12a..7d68bf09 100644
--- a/scripts/shutdown.in
+++ b/scripts/shutdown.in
@@ -1,21 +1,29 @@
#!@SHELL@
-poweroff_arg=
-while getopts :HhPr opt; do
+shutdown_arg=
+while getopts :akrhPHfFnct: opt; do
case "$opt" in
- h|P) poweroff_arg=--poweroff ;;
- H) poweroff_arg=--halt ;;
- r) poweroff_arg=--reboot ;;
- \?) printf "${0##*/}: invalid option ${optarg}\n" >&2
+ a) ;;
+ k) ;;
+ r) shutdown_arg=--reboot ;;
+ h) shutdown_arg=--halt ;;
+ P) shutdown_arg=--poweroff ;;
+ H) shutdown_arg=--halt ;;
+ f) ;;
+ F) ;;
+ n) ;;
+ c) ;;
+ t) ;;
+ [?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
exit 1
;;
esac
done
shift $((OPTIND-1))
-if [ -z "${poweroff_arg}" ]; then
- poweroff_arg=--single
+if [ -z "${shutdown_arg}" ]; then
+ shutdown_arg=--single
fi
-echo @SBINDIR@/openrc-shutdown ${poweroff_arg} ${@}
-exec @SBINDIR@/openrc-shutdown ${poweroff_arg} ${@}
+echo @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
+exec @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
next reply other threads:[~2017-07-11 19:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-11 19:57 William Hubbs [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-07-11 17:06 [gentoo-commits] proj/openrc:master commit in: scripts/ William Hubbs
2017-07-11 16:14 William Hubbs
2017-07-10 23:37 William Hubbs
2017-06-12 23:01 William Hubbs
2017-06-12 23:01 William Hubbs
2017-06-12 23:01 William Hubbs
2017-06-12 15:41 William Hubbs
2017-06-12 15:41 William Hubbs
2017-06-07 16:34 William Hubbs
2017-02-22 20:53 William Hubbs
2017-01-26 21:40 William Hubbs
2017-01-09 2:43 William Hubbs
2011-11-17 18:28 William Hubbs
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=1499802089.e7807b3136d8993805082320784460f5059e6275.williamh@OpenRC \
--to=williamh@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