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

rc-status: show failed services as failed

Browse Source
This commit is contained in:
William Hubbs
2018-11-30 18:46:25 -06:00
parent ebf79db79e
commit db01442580
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rc/rc-status.c
View File

@@ -167,6 +167,9 @@ print_service(const char *service)
} else if (state & RC_SERVICE_SCHEDULED) { } else if (state & RC_SERVICE_SCHEDULED) {
xasprintf(&status, "scheduled"); xasprintf(&status, "scheduled");
color = ECOLOR_WARN; color = ECOLOR_WARN;
} else if (state & RC_SERVICE_FAILED) {
xasprintf(&status, "failed");
color = ECOLOR_WARN;
} else } else
xasprintf(&status, " stopped "); xasprintf(&status, " stopped ");
@@ -238,6 +241,7 @@ print_stacked_services(const char *runlevel)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
RC_SERVICE state;
RC_STRING *s, *l, *t, *level; RC_STRING *s, *l, *t, *level;
bool show_all = false; bool show_all = false;
char *p, *runlevel = NULL; char *p, *runlevel = NULL;
@@ -373,11 +377,14 @@ int main(int argc, char **argv)
free(nservices); free(nservices);
} }
TAILQ_FOREACH_SAFE(s, services, entries, t) { TAILQ_FOREACH_SAFE(s, services, entries, t) {
state = rc_service_state(s->value);
if ((rc_stringlist_find(sservices, s->value) || if ((rc_stringlist_find(sservices, s->value) ||
(rc_service_state(s->value) & ( RC_SERVICE_STOPPED | RC_SERVICE_HOTPLUGGED)))) { (state & ( RC_SERVICE_STOPPED | RC_SERVICE_HOTPLUGGED)))) {
TAILQ_REMOVE(services, s, entries); if (! (state & RC_SERVICE_FAILED)) {
free(s->value); TAILQ_REMOVE(services, s, entries);
free(s); free(s->value);
free(s);
}
} }
} }
needsme = rc_stringlist_new(); needsme = rc_stringlist_new();