7 files changed, 6 insertions, 21 deletions

diff --git a/RELNOTES b/RELNOTES
index fb6b414c5..2c8b43433 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -3,6 +3,7 @@ firejail (0.9.51) baseline; urgency=low
   * modif: --allow-private-blacklists was deprecated; blacklisting,
     read-only, read-write, tmpfs and noexec are allowed in
     private home directories
+  * modif: remount-proc-sys deprecated from firejail.config
   * enhancement: support Firejail user config directory in firecfg
   * enhancement: disable DBus activation in firecfg
   * enhancement; enumerate root directories in apparmor profile
diff --git a/etc/firejail.config b/etc/firejail.config
index b597ed603..26f2dedfc 100644
--- a/etc/firejail.config
+++ b/etc/firejail.config
@@ -69,9 +69,6 @@
 # Enable --quiet as default every time the sandbox is started. Default disabled.
 # quiet-by-default no
 
-# Remount /proc and /sys inside the sandbox, default enabled.
-# remount-proc-sys yes
-
 # 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 7f371b299..1dee87a64 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -299,14 +299,9 @@ int checkcfg(int val) {
                                 else
                                         goto errout;
                         }
-                        // remount /proc and /sys
                         else if (strncmp(ptr, "remount-proc-sys ", 17) == 0) {
-                                if (strcmp(ptr + 17, "yes") == 0)
-                                        cfg_val[CFG_REMOUNT_PROC_SYS] = 1;
-                                else if (strcmp(ptr + 17, "no") == 0)
-                                        cfg_val[CFG_REMOUNT_PROC_SYS] = 0;
-                                else
-                                        goto errout;
+                                if (!arg_quiet)
+                                        fprintf(stderr, "Warning: remount-proc-sys from firejail.config was deprecated\n");
                         }
                         else if (strncmp(ptr, "overlayfs ", 10) == 0) {
                                 if (strcmp(ptr + 10, "yes") == 0)
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index a6b57f263..c6c6c76cc 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -725,7 +725,6 @@ enum {
         CFG_FORCE_NONEWPRIVS,
         CFG_WHITELIST,
         CFG_XEPHYR_WINDOW_TITLE,
-        CFG_REMOUNT_PROC_SYS,
         CFG_OVERLAYFS,
         CFG_CHROOT_DESKTOP,
         CFG_PRIVATE_HOME,
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 67b40f9c2..069aa6ca8 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1615,7 +1615,7 @@ int main(int argc, char **argv) {
                 }
                 else if (strcmp(argv[i], "--allow-private-blacklist") == 0) {
                         if (!arg_quiet)
-                                fprintf(stderr, "--allow-private-blacklist was deprecated\n");
+                                fprintf(stderr, "Warning: --allow-private-blacklist was deprecated\n");
                 }
                 else if (strcmp(argv[i], "--private") == 0) {
                         arg_private = 1;
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index dc1333988..4851dc9ad 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -243,7 +243,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
         }
         else if (strcmp(ptr, "allow-private-blacklist") == 0) {
                 if (!arg_quiet)
-                        fprintf(stderr, "--allow-private-blacklist was deprecated\n");
+                        fprintf(stderr, "Warning: --allow-private-blacklist was deprecated\n");
                 return 0;
         }
         else if (strcmp(ptr, "netfilter") == 0) {
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index b92483c66..131163c68 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -245,12 +245,6 @@ static int monitor_application(pid_t app_pid) {
                         sleep(1);
                 }
 
-                // if /proc is not remounted, we cannot check /proc directory,
-                // for now we just get out of here
-                // todo: find another way of checking child processes!
-                if (!checkcfg(CFG_REMOUNT_PROC_SYS))
-                        break;
-
                 DIR *dir;
                 if (!(dir = opendir("/proc"))) {
                         // sleep 2 seconds and try again
@@ -872,8 +866,7 @@ int sandbox(void* sandbox_arg) {
         //****************************
         // update /proc, /sys, /dev, /boot directory
         //****************************
-        if (checkcfg(CFG_REMOUNT_PROC_SYS))
-                fs_proc_sys_dev_boot();
+        fs_proc_sys_dev_boot();
 
         //****************************
         // handle /mnt and /media