diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-12-21 14:03:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-21 14:03:41 +0000 |
| commit | c28d4701aed97c97727e44d8f7fdf25bd06fee44 (patch) | |
| tree | bc8061cee1de04a6161abb5ca367670e0b3cc884 /sys-apps/openrc | |
| parent | Fix building with -Wl,--as-needed wrt #248016 by Kacper Kowalik. (diff) | |
| download | gentoo-2-c28d4701aed97c97727e44d8f7fdf25bd06fee44.tar.gz gentoo-2-c28d4701aed97c97727e44d8f7fdf25bd06fee44.tar.bz2 gentoo-2-c28d4701aed97c97727e44d8f7fdf25bd06fee44.zip | |
Restore "pause" functionality to teach people to convert #218859 by Martin Mokrejš.
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/openrc')
| -rw-r--r-- | sys-apps/openrc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-9999-pause.patch | 29 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.5.3.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 3 |
4 files changed, 39 insertions, 3 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 85a23afa50d6..2a63b40db403 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.102 2009/12/21 13:48:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.103 2009/12/21 14:03:40 vapier Exp $ + + 21 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild, + openrc-9999.ebuild, +files/openrc-9999-pause.patch: + Restore "pause" functionality to teach people to convert #218859 by Martin + Mokrejš. 21 Dec 2009; Mike Frysinger <vapier@gentoo.org> files/openrc-9999-msg-style.patch: diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch new file mode 100644 index 000000000000..bf2c94f8dbec --- /dev/null +++ b/sys-apps/openrc/files/openrc-9999-pause.patch @@ -0,0 +1,29 @@ +From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 21 Dec 2009 09:02:35 -0500 +Subject: [PATCH] restore init.d pause option + +--- + src/rc/runscript.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/src/rc/runscript.c b/src/rc/runscript.c +index 5939dae..7147902 100644 +--- a/src/rc/runscript.c ++++ b/src/rc/runscript.c +@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv) + prefix = NULL; + retval = svc_exec("status", NULL); + } else { ++ if (strcmp(optarg, "pause") == 0) { ++ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'"); ++ deps = false; ++ optarg = "stop"; ++ } ++ + if (strcmp(optarg, "conditionalrestart") == 0 || + strcmp(optarg, "condrestart") == 0) + { +-- +1.6.6.rc3 + diff --git a/sys-apps/openrc/openrc-0.5.3.ebuild b/sys-apps/openrc/openrc-0.5.3.ebuild index 619d490cdd05..2c2a1a228200 100644 --- a/sys-apps/openrc/openrc-0.5.3.ebuild +++ b/sys-apps/openrc/openrc-0.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild,v 1.2 2009/12/07 09:09:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild,v 1.3 2009/12/21 14:03:40 vapier Exp $ EAPI="1" @@ -68,6 +68,7 @@ src_unpack() { sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342 sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264 epatch "${FILESDIR}"/openrc-9999-msg-style.patch + epatch "${FILESDIR}"/openrc-9999-pause.patch } src_compile() { diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index db8409469bab..468f585f1280 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.66 2009/12/07 09:09:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.67 2009/12/21 14:03:40 vapier Exp $ EAPI="1" @@ -68,6 +68,7 @@ src_unpack() { sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342 sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264 epatch "${FILESDIR}"/openrc-9999-msg-style.patch + epatch "${FILESDIR}"/openrc-9999-pause.patch } src_compile() { |