verdnatura-mirror
/
tini
mirror of https://github.com/krallin/tini.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 in TN/tini from confirm-to-start to master 

* commit '6900453aa76f49feeff11451b0933c16b4f4831f':
  Gate TITUS_CONFIRM to start behind env variable
  Add confirm to launch
This commit is contained in:
Sargun Dhillon 2017-07-07 16:19:09 +00:00
parent 6924b55bb5 6900453aa7
commit 391dac855a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tini.c
View File

@ -30,6 +30,7 @@
#define REDIRECT_STDERR "TITUS_REDIRECT_STDERR"
#define REDIRECT_STDOUT "TITUS_REDIRECT_STDOUT"
#define TITUS_CB_PATH "TITUS_UNIX_CB_PATH"
#define TITUS_CONFIRM "TITUS_CONFIRM"
const char stdioattr[] = "user.stdio";
@ -213,6 +214,7 @@ int spawn(const signal_configuration_t* const sigconf_ptr, char* const argv[], i
unsetenv(REDIRECT_STDERR);
unsetenv(REDIRECT_STDOUT);
unsetenv(TITUS_CB_PATH);
unsetenv(TITUS_CONFIRM);
execvp(argv[0], argv);
@ -611,6 +613,14 @@ void maybe_unix_cb() {
goto error;
}
if (getenv(TITUS_CONFIRM)) {
PRINT_INFO("Waiting to receive message from titus-executor before launching\n");
if (recv(sockfd, data, 1, 0) == -1) {
PRINT_FATAL("Unable to recv start message from socket: '%s'", strerror(errno));
}
PRINT_INFO("Clear to start\n");
}
return;
error: