diff options
| author | Roy Marples <roy@marples.name> | 2009-07-01 00:07:32 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-07-01 00:07:32 +0100 |
| commit | b4104957b198b38aba609ed3889e7fa605012d19 (patch) | |
| tree | 0adad424aa3e5f5ab6fa6cb4f48f9ac9323dc29a /src/rc | |
| parent | 6abeec74301d8406ebbbd653b9fe9a0e234c09bf (diff) | |
We should use -feature instead of nofeature.
This matches the ifconfig and Gentoo USE flag syntax and is hopefully
easier to read.
Fixes #178.
Diffstat (limited to 'src/rc')
| -rw-r--r-- | src/rc/rc.c | 7 | ||||
| -rw-r--r-- | src/rc/runscript.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/rc/rc.c b/src/rc/rc.c index 3d8628e8..6d04b3dd 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -600,8 +600,11 @@ do_stop_services(const char *newlevel, bool parallel, bool going_down) continue; } kwords = rc_deptree_depend(deptree, service->value, "keyword"); - if (rc_stringlist_find(kwords, "nostop") || - (going_down && rc_stringlist_find(kwords, "noshutdown"))) + if (rc_stringlist_find(kwords, "-stop") || + rc_stringlist_find(kwords, "nostop") || + (going_down && + (rc_stringlist_find(kwords, "-shutdown") || + rc_stringlist_find(kwords, "noshutdown")))) nstop = true; else nstop = false; diff --git a/src/rc/runscript.c b/src/rc/runscript.c index 91a31a59..ca0d3252 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -471,7 +471,8 @@ svc_wait(const char *svc) /* Some services don't have a timeout, like fsck */ keywords = rc_deptree_depend(deptree, svc, "keyword"); - if (rc_stringlist_find(keywords, "notimeout")) + if (rc_stringlist_find(keywords, "-timeout") || + rc_stringlist_find(keywords, "notimeout")) forever = true; rc_stringlist_free(keywords); |