From fc1bfe4234714cdcc6b158ec04cb3f92c7c8caa7 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 28 Sep 2007 15:04:15 +0000 Subject: Crashed is not a baselayout state as such --- src/librc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/librc.c') diff --git a/src/librc.c b/src/librc.c index f3495cbe..96588e3f 100644 --- a/src/librc.c +++ b/src/librc.c @@ -339,9 +339,8 @@ bool rc_mark_service (const char *service, const rc_service_state_t state) if ((s != skip_state && s != RC_SERVICE_STOPPED && s != RC_SERVICE_COLDPLUGGED && - s != RC_SERVICE_SCHEDULED && - s != RC_SERVICE_CRASHED) && - (! skip_wasinactive || i != RC_SERVICE_WASINACTIVE)) + s != RC_SERVICE_SCHEDULED) && + (! skip_wasinactive || s != RC_SERVICE_WASINACTIVE)) { file = rc_strcatpaths (RC_SVCDIR, rc_parse_service_state(s), base, (char *) NULL); @@ -351,7 +350,7 @@ bool rc_mark_service (const char *service, const rc_service_state_t state) s == RC_SERVICE_INACTIVE) { char *wasfile = rc_strcatpaths (RC_SVCDIR, - rc_parse_service_state (RC_SERVICE_WASINACTIVE), + rc_parse_service_state (RC_SERVICE_WASINACTIVE), base, (char *) NULL); if (symlink (init, wasfile) != 0) @@ -457,11 +456,6 @@ rc_service_state_t rc_service_state (const char *service) } } - if (state & RC_SERVICE_STARTED && geteuid () == 0) { - if (rc_service_daemons_crashed (service)) - state |= RC_SERVICE_CRASHED; - } - return (state); } librc_hidden_def(rc_service_state) -- cgit v1.2.3