mirror of
https://github.com/pygos/init.git
synced 2024-11-25 04:20:42 +01:00
David Oberhollenzer
390175c406
Simply execute the last entry in the list directly instead of forking and remove the cleanup code. If the list is empty, we return success. If the list only has one entry, we directly execute that. No need to make a distinction between single entry vs list anymore. If the list is an actual list, we run it as before but execute the last one directly. Typically, the last one is something like a daemon preceeded by setup code. The daemon ends up directly underneath init, without a dummy waiting runsvc stuck in the process list. If we always do an exec, there is no point in doing cleanup. All our mapped memory is evicted anyway. Same if we exit appruptly because of an error. Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
72 lines
1.3 KiB
C
72 lines
1.3 KiB
C
/* SPDX-License-Identifier: ISC */
|
|
#include "runsvc.h"
|
|
|
|
static int run_sequentially(exec_t *list)
|
|
{
|
|
pid_t ret, pid;
|
|
int status;
|
|
|
|
for (; list != NULL; list = list->next) {
|
|
if (list->next == NULL)
|
|
argv_exec(list);
|
|
|
|
pid = fork();
|
|
|
|
if (pid == 0)
|
|
argv_exec(list);
|
|
|
|
if (pid == -1) {
|
|
perror("fork");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
do {
|
|
ret = waitpid(pid, &status, 0);
|
|
} while (ret != pid);
|
|
|
|
if (!WIFEXITED(status))
|
|
return EXIT_FAILURE;
|
|
|
|
if (WEXITSTATUS(status) != EXIT_SUCCESS)
|
|
return WEXITSTATUS(status);
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
service_t *svc = NULL;
|
|
int dirfd;
|
|
|
|
if (argc != 3) {
|
|
fputs("usage: runsvc <directory> <filename>\n", stderr);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
if (getppid() != 1) {
|
|
fputs("must be run by init!\n", stderr);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
dirfd = open(argv[1], O_RDONLY | O_DIRECTORY);
|
|
if (dirfd < 0) {
|
|
perror(argv[1]);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
svc = rdsvc(dirfd, argv[2], RDSVC_NO_FNAME | RDSVC_NO_DEPS);
|
|
close(dirfd);
|
|
if (svc == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
if (initenv())
|
|
return EXIT_FAILURE;
|
|
|
|
if (setup_tty(svc->ctty, (svc->flags & SVC_FLAG_TRUNCATE_OUT) != 0))
|
|
return EXIT_FAILURE;
|
|
|
|
return run_sequentially(svc->exec);
|
|
}
|