aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar quentin <quentin@minster.io>2019-05-13 22:17:44 +0200
committerLibravatar quentin <quentin@minster.io>2019-05-13 22:43:56 +0200
commitf1207e70c4703c5ff2c2f4b8a7506860f611c633 (patch)
treed8e24beae3af5f63196c3da654889514fbba8e73 /src
parentMerge pull request #2691 from curiosity-seeker/master (diff)
downloadfirejail-f1207e70c4703c5ff2c2f4b8a7506860f611c633.tar.gz
firejail-f1207e70c4703c5ff2c2f4b8a7506860f611c633.tar.zst
firejail-f1207e70c4703c5ff2c2f4b8a7506860f611c633.zip
Propagate --quiet to children Firejail'ed processes
If quiet, set environment variable FIREJAIL_QUIET to "yes" before spawning the child process. Upon starting Firejail, become quiet if the FIREJAIL_QUIET environment variable is set to "yes". Signed-off-by: Quentin Minster <quentin@minster.io>
Diffstat (limited to 'src')
-rw-r--r--src/firejail/main.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c
index ece4c2cb5..7fa552c98 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
@@ -2422,6 +2423,10 @@ int main(int argc, char **argv) {
2422 } 2423 }
2423 EUID_ASSERT(); 2424 EUID_ASSERT();
2424 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
2425 // block X11 sockets 2430 // block X11 sockets
2426 if (arg_x11_block) 2431 if (arg_x11_block)
2427 x11_block(); 2432 x11_block();