wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-08 16:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support args to sysv-like scripts, e.g. bridge-stp br0 start

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2022-04-26 00:07:44 +02:00
1 parent bc4e7a8d8d
commit 09f46f62b4
1 file changed
+23 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+23 -4
View File
@@ -482,7 +482,7 @@ static int service_start(svc_t *svc)
} }
if (svc_is_sysv(svc)) if (svc_is_sysv(svc))
logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s start' ...", svc->cmd); logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s [..] start' ...", svc->cmd);
if (!svc->desc[0]) if (!svc->desc[0])
do_progress = 0; do_progress = 0;
@@ -569,8 +569,16 @@ static int service_start(svc_t *svc)
} }
wordfree(&we); wordfree(&we);
} else { } else {
size_t j;
i = 0; i = 0;
args[i++] = svc->cmd; args[i++] = svc->cmd;
/* this handles, e.g., bridge-stop br0 start */
for (j = 0; j < MAX_NUM_SVC_ARGS; j++) {
if (!strlen(svc->args[j]))
break;
args[i++] = svc->args[j];
}
args[i++] = "start"; args[i++] = "start";
} }
args[i] = NULL; args[i] = NULL;
@@ -736,7 +744,7 @@ static int service_stop(svc_t *svc)
logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending %s ...", logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending %s ...",
svc_ident(svc, NULL, 0), svc->pid, sig_name(svc->sighalt)); svc_ident(svc, NULL, 0), svc->pid, sig_name(svc->sighalt));
} else { } else {
logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s stop' ...", svc->cmd); logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s [..] stop' ...", svc->cmd);
} }
/* /*
@@ -776,15 +784,26 @@ static int service_stop(svc_t *svc)
svc_set_state(svc, SVC_HALTED_STATE); svc_set_state(svc, SVC_HALTED_STATE);
} }
} else { } else {
char *args[] = { svc->cmd, "stop", NULL }; char *args[MAX_NUM_SVC_ARGS + 1];
size_t i = 0, j;
pid_t pid; pid_t pid;
args[i++] = svc->cmd;
/* this handles, e.g., bridge-stop br0 stop */
for (j = 0; j < MAX_NUM_SVC_ARGS; j++) {
if (!strlen(svc->args[j]))
break;
args[i++] = svc->args[j];
}
args[i++] = "stop";
args[i] = NULL;
pid = fork(); pid = fork();
switch (pid) { switch (pid) {
case 0: case 0:
setsid(); setsid();
redirect(svc); redirect(svc);
exec_runtask(svc->cmd, args); exec_runtask(args[0], &args[1]);
_exit(0); _exit(0);
break; break;
case -1: case -1: