diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2026-04-25 16:35:28 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2026-04-25 16:35:28 -0400 |
| commit | 8f209a9ab8dfca02ce5c53f50d87919b7202e3f1 (patch) | |
| tree | 3887a54bc7dd16a8bfca02aac3001c013ca34058 /src/cli | |
| parent | 0d4b95442be1dcb72855a2384744d0e13cc4ee7d (diff) | |
| download | stasis-8f209a9ab8dfca02ce5c53f50d87919b7202e3f1.tar.gz | |
Set starting TMPDIR to /tmp/stasis
* Easier to remove leftover files, if any
* Now uses setenv() to have better control over external programs
* Removes the hack to initialize TMPDIR early
Diffstat (limited to 'src/cli')
| -rw-r--r-- | src/cli/stasis/system_requirements.c | 4 | ||||
| -rw-r--r-- | src/cli/stasis_indexer/stasis_indexer_main.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/cli/stasis/system_requirements.c b/src/cli/stasis/system_requirements.c index 0f0aae8..ebfbffc 100644 --- a/src/cli/stasis/system_requirements.c +++ b/src/cli/stasis/system_requirements.c @@ -38,10 +38,6 @@ void check_system_requirements(struct Delivery *ctx) { msg(STASIS_MSG_RESTRICT, "found\n"); } - if (!globals.tmpdir && !ctx->storage.tmpdir) { - delivery_init_tmpdir(ctx); - } - msg(STASIS_MSG_L2, "Docker\n"); if (docker_capable(&ctx->deploy.docker.capabilities)) { struct DockerCapabilities *dcap = &ctx->deploy.docker.capabilities; diff --git a/src/cli/stasis_indexer/stasis_indexer_main.c b/src/cli/stasis_indexer/stasis_indexer_main.c index 5a92014..d71c341 100644 --- a/src/cli/stasis_indexer/stasis_indexer_main.c +++ b/src/cli/stasis_indexer/stasis_indexer_main.c @@ -274,8 +274,14 @@ int main(const int argc, char *argv[]) { if (system_tmp) { strncat(workdir_template, system_tmp, sizeof(workdir_template) - strlen(workdir_template) - 1); } else { - strncat(workdir_template, "/tmp", sizeof(workdir_template) - strlen(workdir_template) - 1); + strncat(workdir_template, "/tmp/stasis", sizeof(workdir_template) - strlen(workdir_template) - 1); } + + if (mkdirs(workdir_template, 0700)) { + SYSERROR("Unable to create directory '%s': %s", workdir_template, strerror(errno)); + exit(1); + } + strncat(workdir_template, "/stasis-combine.XXXXXX", sizeof(workdir_template) - strlen(workdir_template) - 1); char *workdir = mkdtemp(workdir_template); if (!workdir) { |