mirror of
https://github.com/troglobit/finit.git
synced 2026-11-02 13:20:32 +00:00
Hide progress output also on stop/shutdown for services w/o -- descr
Progress at startup has been hidden for services w/o -- description, but for some reason this check was not added to service_stop(). This patch rectifies the situation, finally. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
a19b82ea5f
commit
2a23bce78d
1 file changed
+5
-1
+5
-1
@@ -702,6 +702,7 @@ static void service_cleanup(svc_t *svc)
|
|||||||
*/
|
*/
|
||||||
static int service_stop(svc_t *svc)
|
static int service_stop(svc_t *svc)
|
||||||
{
|
{
|
||||||
|
int do_progress = 1;
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
if (!svc)
|
if (!svc)
|
||||||
@@ -726,7 +727,10 @@ static int service_stop(svc_t *svc)
|
|||||||
|
|
||||||
svc_set_state(svc, SVC_STOPPING_STATE);
|
svc_set_state(svc, SVC_STOPPING_STATE);
|
||||||
|
|
||||||
if (runlevel != 1)
|
if (!svc->desc[0])
|
||||||
|
do_progress = 0;
|
||||||
|
|
||||||
|
if (runlevel != 1 && do_progress)
|
||||||
print_desc("Stopping ", svc->desc);
|
print_desc("Stopping ", svc->desc);
|
||||||
|
|
||||||
if (!svc_is_sysv(svc)) {
|
if (!svc_is_sysv(svc)) {
|
||||||
|
|||||||
Reference in new issue
Block a user