diff options
author | quentin <quentin@minster.io> | 2019-05-17 17:02:58 +0200 |
---|---|---|
committer | quentin <quentin@minster.io> | 2019-05-17 17:02:58 +0200 |
commit | ce3ff9711e7cb6d966ce07714c5cd7ac331f7937 (patch) | |
tree | 80db7a62a45b7df91502ff7bfd812843ac29a5dd /src | |
parent | Propagate --quiet to children Firejail'ed processes (diff) | |
download | firejail-ce3ff9711e7cb6d966ce07714c5cd7ac331f7937.tar.gz firejail-ce3ff9711e7cb6d966ce07714c5cd7ac331f7937.tar.zst firejail-ce3ff9711e7cb6d966ce07714c5cd7ac331f7937.zip |
Move export of FIREJAIL_QUIET to env_defaults()
So that it also works with --join. (HT @smitsohu)
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/env.c | 5 | ||||
-rw-r--r-- | src/firejail/main.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/firejail/env.c b/src/firejail/env.c index 2e9f516ba..f15e1362f 100644 --- a/src/firejail/env.c +++ b/src/firejail/env.c | |||
@@ -160,6 +160,11 @@ void env_defaults(void) { | |||
160 | // set the window title | 160 | // set the window title |
161 | if (!arg_quiet) | 161 | if (!arg_quiet) |
162 | printf("\033]0;firejail %s\007", cfg.window_title); | 162 | printf("\033]0;firejail %s\007", cfg.window_title); |
163 | |||
164 | // pass --quiet as an environment variable, in case the command calls further firejailed commands | ||
165 | if (arg_quiet) | ||
166 | setenv("FIREJAIL_QUIET", "yes", 1); | ||
167 | |||
163 | fflush(0); | 168 | fflush(0); |
164 | } | 169 | } |
165 | 170 | ||
diff --git a/src/firejail/main.c b/src/firejail/main.c index 7fa552c98..f3dc72944 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -2423,10 +2423,6 @@ int main(int argc, char **argv) { | |||
2423 | } | 2423 | } |
2424 | EUID_ASSERT(); | 2424 | EUID_ASSERT(); |
2425 | 2425 | ||
2426 | // pass --quiet as an environment variable, in case the command calls further firejailed commands | ||
2427 | if (arg_quiet) | ||
2428 | setenv("FIREJAIL_QUIET", "yes", 1); | ||
2429 | |||
2430 | // block X11 sockets | 2426 | // block X11 sockets |
2431 | if (arg_x11_block) | 2427 | if (arg_x11_block) |
2432 | x11_block(); | 2428 | x11_block(); |