diff options
author | netblue30 <netblue30@yahoo.com> | 2019-05-17 10:34:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-17 10:34:53 -0500 |
commit | e23fd7fc092016acc3cee7f008549650ca423836 (patch) | |
tree | 60e9d5b236a92f426dfcae0965f56a0153a8b92b /src | |
parent | Merge pull request #2697 from topimiettinen/dbus-block-system-bus (diff) | |
parent | Move export of FIREJAIL_QUIET to env_defaults() (diff) | |
download | firejail-e23fd7fc092016acc3cee7f008549650ca423836.tar.gz firejail-e23fd7fc092016acc3cee7f008549650ca423836.tar.zst firejail-e23fd7fc092016acc3cee7f008549650ca423836.zip |
Merge pull request #2694 from laomaiweng/propagate-quiet
Propagate --quiet to children Firejail'ed processes
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/env.c | 5 | ||||
-rw-r--r-- | src/firejail/main.c | 3 |
2 files changed, 7 insertions, 1 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 ece4c2cb5..f3dc72944 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -907,7 +907,8 @@ int main(int argc, char **argv) { | |||
907 | 907 | ||
908 | // get starting timestamp, process --quiet | 908 | // get starting timestamp, process --quiet |
909 | start_timestamp = getticks(); | 909 | start_timestamp = getticks(); |
910 | if (check_arg(argc, argv, "--quiet", 1)) | 910 | char *env_quiet = getenv("FIREJAIL_QUIET"); |
911 | if (check_arg(argc, argv, "--quiet", 1) || (env_quiet && strcmp(env_quiet, "yes") == 0)) | ||
911 | arg_quiet = 1; | 912 | arg_quiet = 1; |
912 | 913 | ||
913 | // cleanup at exit | 914 | // cleanup at exit |