Add --keep-dev-shm (undocumented for now).

1 files changed, 14 insertions, 9 deletions

diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index 9e287bf27..ff525f0b9 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -171,12 +171,23 @@ static void empty_dev_shm(void) {
         fs_logger("create /dev/shm");
 }
 
+static void mount_dev_shm(void) {
+        mkdir_attr("/dev/shm", 01777, 0, 0);
+        int rv = mount(RUN_DEV_DIR "/shm", "/dev/shm", "none", MS_BIND, "mode=01777,gid=0");
+        if (rv == -1) {
+                fwarning("cannot mount the old /dev/shm in private-dev\n");
+                dbg_test_dir(RUN_DEV_DIR "/shm");
+                empty_dev_shm();
+                return;
+        }
+}
+
 static void process_dev_shm(void) {
         // Jack audio keeps an Unix socket under (/dev/shm/jack_default_1000_0 or /dev/shm/jack/...)
         // looking for jack socket
         glob_t globbuf;
         int globerr = glob(RUN_DEV_DIR "/shm/jack*", GLOB_NOSORT, NULL, &globbuf);
-        if (globerr) {
+        if (globerr && !arg_keep_dev_shm) {
                 empty_dev_shm();
                 return;
         }
@@ -184,14 +195,8 @@ static void process_dev_shm(void) {
 
         // if we got here, it means we have a jack server installed
         // mount-bind the old /dev/shm
-        mkdir_attr("/dev/shm", 01777, 0, 0);
-        int rv = mount(RUN_DEV_DIR "/shm", "/dev/shm", "none", MS_BIND, "mode=01777,gid=0");
-        if (rv == -1) {
-                fwarning("cannot mount the old /dev/shm in private-dev\n");
-                dbg_test_dir(RUN_DEV_DIR "/shm");
-                empty_dev_shm();
-                return;
-        }
+        mount_dev_shm();
+
 }