Merge pull request #233 from liuming50/fix-a-return-value-of-initctl-status

initctl: fix return status of run tasks

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

src/initctl.c

@@ -791,8 +791,15 @@ static int show_status(char *arg)
 		if (!svc)
 			return 255;
 
-		if (quiet)
+		if (quiet) {
-			return svc->state != SVC_RUNNING_STATE;
+			if (svc_is_runtask(svc))
+				if (svc->started)
+					return 0;
+				else
+					return 1;
+			else
+				return svc->state != SVC_RUNNING_STATE;
+		}
 
 		pidfn = svc->pidfile;
 		if (pidfn[0] == '!')

src/svc.h

@@ -332,7 +332,10 @@ static inline char *svc_status(svc_t *svc)
 		return "unknown";
 
 	case SVC_DONE_STATE:
-		return "done";
+		if (svc->started)
+			return "done";
+		else
+			return "failed";
 
 	case SVC_STOPPING_STATE:
 		switch (svc->type) {