4 files changed, 24 insertions, 10 deletions

diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index f0f2aaeb7..9c7c49e1d 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "../include/common.h"
+static int arg_debug = 0;
 
 static void usage(void) {
         printf("firecfg - version %s\n\n", VERSION);
@@ -37,6 +38,7 @@ static void usage(void) {
         printf("DESKTOP INTEGRATION section in man 1 firejail.\n\n");
         printf("Usage: firecfg [OPTIONS]\n\n");
         printf("   --clean - remove all firejail symbolic links.\n\n");
+        printf("   --debug - print debug messages.\n\n");
         printf("   --help, -? - this help screen.\n\n");
         printf("   --list - list all firejail symbolic links.\n\n");
         printf("   --version - print program version and exit.\n\n");
@@ -67,9 +69,12 @@ static int find(const char *program, const char *directory) {
                 errExit("asprintf");
                 
         struct stat s;
-        if (stat(fname, &s) == 0)
+        if (stat(fname, &s) == 0) {
+                if (arg_debug)
+                        printf("found %s in directory %s\n", program, directory);
                 retval = 1;
-        
+        }
+                
         free(fname);
         return retval;
 }
@@ -206,8 +211,9 @@ static void set_file(const char *name, const char *firejail_exec) {
                 errExit("asprintf");
         
         struct stat s;
-        if (stat(fname, &s) == 0)
-                ; //printf("%s already present\n", fname);
+        if (stat(fname, &s) == 0) {
+                printf("%s is already present, skipping...\n", fname);
+        }
         else {
                 int rv = symlink(firejail_exec, fname);
                 if (rv) {
@@ -289,6 +295,8 @@ int main(int argc, char **argv) {
                         usage();
                         return 0;
                 }
+                else if (strcmp(argv[i], "--debug") == 0)
+                        arg_debug = 1;
                 else if (strcmp(argv[i], "--version") == 0) {
                         printf("firecfg version %s\n\n", VERSION);
                         return 0;
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index dca66888c..cc2aa8f4d 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -28,6 +28,8 @@ static char *paths[] = {
         "/usr/local/bin",
         "/usr/bin",
         "/bin",
+        "/usr/games",
+        "/usr/local/games",
         "/usr/local/sbin",
         "/usr/sbin",
         "/sbin",
@@ -76,7 +78,8 @@ static char *check_dir_or_file(const char *name) {
         }
 
         if (!fname) {
-//              fprintf(stderr, "Warning: file %s not found\n", name);
+                if (arg_debug)
+                        fprintf(stderr, "Warning: file %s not found\n", name);
                 return NULL;
         }
         
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index d9866385e..f37605e20 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -541,6 +541,11 @@ int sandbox(void* sandbox_arg) {
                 fs_private_tmp();
         
         //****************************
+        // update /proc, /sys, /dev, /boot directorymy
+        //****************************
+        fs_proc_sys_dev_boot();
+        
+        //****************************
         // apply the profile file
         //****************************
         if (cfg.profile) {
@@ -558,11 +563,6 @@ int sandbox(void* sandbox_arg) {
                 fs_trace();
                 
         //****************************
-        // update /proc, /dev, /boot directorymy
-        //****************************
-        fs_proc_sys_dev_boot();
-        
-        //****************************
         // --nosound and fix for pulseaudio 7.0
         //****************************
         if (arg_nosound) {
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt
index c12bf7731..9458c4b67 100644
--- a/src/man/firecfg.txt
+++ b/src/man/firecfg.txt
@@ -17,6 +17,9 @@ The symbolic links are placed in /usr/local/bin. For more information, see
 \fB\-\-clean
 Remove all firejail symbolic links.
 .TP
+\fB\-\-debug
+Print debug messages.
+.TP
 \fB\-?\fR, \fB\-\-help\fR
 Print options end exit.
 .TP