openSUSE fix: mount private-etc on /usr/etc as well

see issue #3145

3 files changed, 4 insertions, 1 deletions

diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index 7b7813926..76bcb751e 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -145,7 +145,8 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c
         // nothing to do if directory does not exist
         struct stat s;
         if (stat(private_dir, &s) == -1) {
-                fmessage("Cannot find %s\n", private_dir);
+                if (arg_debug)
+                        printf("Cannot find %s\n", private_dir);
                 return;
         }
 
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 96ad30bed..4f53cafcc 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -855,6 +855,7 @@ int sandbox(void* sandbox_arg) {
                         fwarning("private-etc feature is disabled in overlay\n");
                 else {
                         fs_private_dir_list("/etc", RUN_ETC_DIR, cfg.etc_private_keep);
+                        fs_private_dir_list("/usr/etc", RUN_USR_ETC_DIR, cfg.etc_private_keep); // openSUSE
                         // create /etc/ld.so.preload file again
                         if (need_preload)
                                 fs_trace_preload();
diff --git a/src/include/rundefs.h b/src/include/rundefs.h
index 7f9c68be2..1cfeee28d 100644
--- a/src/include/rundefs.h
+++ b/src/include/rundefs.h
@@ -42,6 +42,7 @@
 #define RUN_NONEWPRIVS_CFG              RUN_MNT_DIR "/nonewprivs"
 #define RUN_HOME_DIR                    RUN_MNT_DIR "/home"
 #define RUN_ETC_DIR                     RUN_MNT_DIR "/etc"
+#define RUN_USR_ETC_DIR         RUN_MNT_DIR "/usretc"
 #define RUN_OPT_DIR                     RUN_MNT_DIR "/opt"
 #define RUN_SRV_DIR                     RUN_MNT_DIR "/srv"
 #define RUN_BIN_DIR                     RUN_MNT_DIR "/bin"