summaryrefslogtreecommitdiff
path: root/src/rc/runscript.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-05-17 12:29:46 +0100
committerRoy Marples <roy@marples.name>2009-05-17 12:29:46 +0100
commit5294abe6171610a1aa0eb093774bed9bb965c9cf (patch)
tree15a825c343482e368b568916c86b80535d153927 /src/rc/runscript.c
parent701813b5ff76f4630376263a94d610462aa99c3b (diff)
downloadopenrc-5294abe6171610a1aa0eb093774bed9bb965c9cf.tar.gz
openrc-5294abe6171610a1aa0eb093774bed9bb965c9cf.tar.bz2
openrc-5294abe6171610a1aa0eb093774bed9bb965c9cf.tar.xz
If already started or stopped, abort.
Diffstat (limited to 'src/rc/runscript.c')
-rw-r--r--src/rc/runscript.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index cec7e01..c82e55f 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -586,10 +586,9 @@ svc_start_check(void)
fcntl(exclusive_fd, F_SETFD,
fcntl(exclusive_fd, F_GETFD, 0) | FD_CLOEXEC);
- if (state & RC_SERVICE_STARTED) {
- ewarn("WARNING: %s has already been started", applet);
- return;
- } else if (state & RC_SERVICE_INACTIVE && !in_background)
+ if (state & RC_SERVICE_STARTED)
+ ewarnx("WARNING: %s has already been started", applet);
+ else if (state & RC_SERVICE_INACTIVE && !in_background)
ewarnx("WARNING: %s has already started, but is inactive",
applet);
@@ -837,10 +836,8 @@ svc_stop_check(RC_SERVICE *state)
fcntl(exclusive_fd, F_SETFD,
fcntl(exclusive_fd, F_GETFD, 0) | FD_CLOEXEC);
- if (*state & RC_SERVICE_STOPPED) {
- ewarn("WARNING: %s is already stopped", applet);
- return;
- }
+ if (*state & RC_SERVICE_STOPPED)
+ ewarnx("WARNING: %s is already stopped", applet);
rc_service_mark(service, RC_SERVICE_STOPPING);
hook_out = RC_HOOK_SERVICE_STOP_OUT;