4 files changed, 13 insertions, 3 deletions

diff --git a/RELNOTES b/RELNOTES
index 6449a13f2..79f634dcd 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -18,6 +18,7 @@ firejail (0.9.42~rc2) baseline; urgency=low
   * seccomp filter updated
   * compile time and run time support to disable whitelists
   * compile time support to disable global configuration file
+  * added quiet-by-default config option in /etc/firejail/firejail.config
   * added netfilter-default config option in /etc/firejail/firejail.config
   * new profiles: Gitter, gThumb, mpv, Franz messenger, LibreOffice
   * new profiles: pix, audacity, xz, xzdec, gzip, cpio, less
diff --git a/etc/firejail.config b/etc/firejail.config
index 20c4d7a5f..82fe65ac7 100644
--- a/etc/firejail.config
+++ b/etc/firejail.config
@@ -15,12 +15,16 @@
 # Force use of nonewprivs.  This mitigates the possibility of
 # a user abusing firejail's features to trick a privileged (suid
 # or file capabilities) process into loading code or configuration
-# that is partially under their control.  Default disabled
+# that is partially under their control.  Default disabled.
 # force-nonewprivs no
 
 # Enable or disable networking features, default enabled.
 # network yes
 
+# Enable --quiet as default every time the sandbox is started. Default disabled.
+# quiet-by-default no
+
+
 # Enable or disable restricted network support, default disabled. If enabled,
 # networking features should also be enabled (network yes).
 # Restricted networking grants access to --interface, --net=ethXXX and
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 12921e294..3b60dafb6 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -220,7 +220,12 @@ int checkcfg(int val) {
                                 if (!xephyr_extra_params)
                                         errExit("strdup");
                         }
-
+                        
+                        // quiet by default
+                        else if (strncmp(ptr, "quiet-by-default ", 17) == 0) {
+                                if (strcmp(ptr + 17, "yes") == 0)
+                                        arg_quiet = 1;
+                        }
                         else
                                 goto errout;
 
diff --git a/src/firejail/env.c b/src/firejail/env.c
index a5b3ccfb3..79d6b81e3 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -133,7 +133,7 @@ void env_defaults(void) {
                 errExit("setenv");
 
         // set the window title
-        printf("\033]0;firejail %s\007\n", cfg.window_title);
+        printf("\033]0;firejail %s\007", cfg.window_title);fflush(0);
 }
 
 // parse and store the environment setting