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

If already started or stopped, abort.

Browse Source
This commit is contained in:
Roy Marples 2009-05-17 12:29:46 +01:00
parent 701813b5ff
commit 5294abe617
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rc/runscript.c
View File

@ -586,10 +586,9 @@ svc_start_check(void)
fcntl(exclusive_fd, F_SETFD, fcntl(exclusive_fd, F_SETFD,
fcntl(exclusive_fd, F_GETFD, 0) | FD_CLOEXEC); fcntl(exclusive_fd, F_GETFD, 0) | FD_CLOEXEC);
if (state & RC_SERVICE_STARTED) { if (state & RC_SERVICE_STARTED)
ewarn("WARNING: %s has already been started", applet); ewarnx("WARNING: %s has already been started", applet);
return; else if (state & RC_SERVICE_INACTIVE && !in_background)
} else if (state & RC_SERVICE_INACTIVE && !in_background)
ewarnx("WARNING: %s has already started, but is inactive", ewarnx("WARNING: %s has already started, but is inactive",
applet); applet);
@ -837,10 +836,8 @@ svc_stop_check(RC_SERVICE *state)
fcntl(exclusive_fd, F_SETFD, fcntl(exclusive_fd, F_SETFD,
fcntl(exclusive_fd, F_GETFD, 0) | FD_CLOEXEC); fcntl(exclusive_fd, F_GETFD, 0) | FD_CLOEXEC);
if (*state & RC_SERVICE_STOPPED) { if (*state & RC_SERVICE_STOPPED)
ewarn("WARNING: %s is already stopped", applet); ewarnx("WARNING: %s is already stopped", applet);
return;
}
rc_service_mark(service, RC_SERVICE_STOPPING); rc_service_mark(service, RC_SERVICE_STOPPING);
hook_out = RC_HOOK_SERVICE_STOP_OUT; hook_out = RC_HOOK_SERVICE_STOP_OUT;