mirror of
https://github.com/troglobit/finit.git
synced 2026-10-30 12:50:34 +00:00
Silence Finit progress output for run/tasks stopping
Sync with Starting message in service_start(), should only be shown for daemons and sysv services. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
5281d82e80
commit
58239b897b
1 file changed
+6
-2
+6
-2
@@ -992,7 +992,11 @@ int service_stop(svc_t *svc)
|
|||||||
if (!svc->desc[0])
|
if (!svc->desc[0])
|
||||||
do_progress = 0;
|
do_progress = 0;
|
||||||
|
|
||||||
if (runlevel != 1 && do_progress)
|
/*
|
||||||
|
* Skip run/tasks in progress, would otherwise print silly stuff
|
||||||
|
* like: "Stopping Shutting down" ...
|
||||||
|
*/
|
||||||
|
if (runlevel != 1 && do_progress && (svc_is_daemon(svc) || svc_is_sysv(svc)))
|
||||||
print_desc("Stopping ", svc->desc);
|
print_desc("Stopping ", svc->desc);
|
||||||
|
|
||||||
if (!svc_is_sysv(svc)) {
|
if (!svc_is_sysv(svc)) {
|
||||||
@@ -1048,7 +1052,7 @@ int service_stop(svc_t *svc)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (runlevel != 1 && do_progress)
|
if (runlevel != 1 && do_progress && (svc_is_daemon(svc) || svc_is_sysv(svc)))
|
||||||
print_result(rc);
|
print_result(rc);
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
|
|||||||
Reference in new issue
Block a user