emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the nostop keyword so that we don't stop the network init script by default.

Browse Source
This commit is contained in:
Roy Marples 2009-04-26 21:16:05 +00:00
parent 2b866f264f
commit eaa32c75c9
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.d/network.in
View File

@ -13,6 +13,8 @@ depend()
need localmount need localmount
after bootmisc after bootmisc
provide net provide net
# We don't want to stop network unless we really have to
keyword nostop
keyword nojail noprefix novserver keyword nojail noprefix novserver
} }

7
man/runscript.8
View File

@ -1,4 +1,4 @@
.\" Copyright 2007-2008 Roy Marples .\" Copyright 2007-2009 Roy Marples
.\" All rights reserved .\" All rights reserved
.\" .\"
.\" Redistribution and use in source and binary forms, with or without .\" Redistribution and use in source and binary forms, with or without
@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.Dd September 19, 2008 .Dd April 26, 2009
.Dt RUNSCRIPT 8 SMM .Dt RUNSCRIPT 8 SMM
.Os OpenRC .Os OpenRC
.Sh NAME .Sh NAME
@ -139,6 +139,9 @@ When in a jail, exclude this service from any dependencies. The service can
still be run directly. still be run directly.
.It Dv noopenvz .It Dv noopenvz
Same as nojail, but for OpenVZ systems. Same as nojail, but for OpenVZ systems.
.It Dv nostop
Don't stop this service when changing runlevels, even if not present.
This includes shutting the system down.
.It Dv notimeout .It Dv notimeout
Do not time out waiting for that service. Do not time out waiting for that service.
.It Dv nouml .It Dv nouml

12
src/rc/rc.c
View File

@ -577,10 +577,10 @@ do_stop_services(const char *newlevel, bool parallel)
{ {
pid_t pid; pid_t pid;
RC_STRING *service, *svc1, *svc2; RC_STRING *service, *svc1, *svc2;
RC_STRINGLIST *deporder, *tmplist; RC_STRINGLIST *deporder, *tmplist, *kwords;
RC_SERVICE state; RC_SERVICE state;
RC_STRINGLIST *nostop; RC_STRINGLIST *nostop;
bool crashed; bool crashed, nstop;
if (!types_n) { if (!types_n) {
types_n = rc_stringlist_new(); types_n = rc_stringlist_new();
@ -601,6 +601,14 @@ do_stop_services(const char *newlevel, bool parallel)
rc_service_mark(service->value, RC_SERVICE_FAILED); rc_service_mark(service->value, RC_SERVICE_FAILED);
continue; continue;
} }
kwords = rc_deptree_depend(deptree, service->value, "keyword");
if (rc_stringlist_find(kwords, "nostop"))
nstop = true;
else
nstop = false;
rc_stringlist_free(kwords);
if (nstop)
continue;
/* If the service has crashed, skip futher checks and just stop /* If the service has crashed, skip futher checks and just stop
it */ it */