diff options
author | netblue30 <netblue30@yahoo.com> | 2018-10-13 09:38:38 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2018-10-13 09:38:38 -0400 |
commit | 16587f6d2bb6273ba3f519eeab867175948e388f (patch) | |
tree | b15791a194f9cfebd729bb4f8eae3d36f51422a3 /src/firejail/preproc.c | |
parent | Merge pull request #2185 from glitsj16/masterpdfeditor (diff) | |
download | firejail-16587f6d2bb6273ba3f519eeab867175948e388f.tar.gz firejail-16587f6d2bb6273ba3f519eeab867175948e388f.tar.zst firejail-16587f6d2bb6273ba3f519eeab867175948e388f.zip |
Revert "Fix issue #2148: Make sure firejail can find helper programs in sandbox regardless of options."
This reverts commit 4017e8a1359208e149b2eac10900987acd4a6f9e.
I am running into some problems with the initial unshare/mount in main.c.
I'll bring in the files one by one.
Diffstat (limited to 'src/firejail/preproc.c')
-rw-r--r-- | src/firejail/preproc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c index cc72cfef9..f519ed85f 100644 --- a/src/firejail/preproc.c +++ b/src/firejail/preproc.c | |||
@@ -62,20 +62,12 @@ void preproc_build_firejail_dir(void) { | |||
62 | create_empty_dir_as_root(RUN_FIREJAIL_APPIMAGE_DIR, 0755); | 62 | create_empty_dir_as_root(RUN_FIREJAIL_APPIMAGE_DIR, 0755); |
63 | } | 63 | } |
64 | 64 | ||
65 | if (stat(RUN_FIREJAIL_LIB_DIR, &s)) { | ||
66 | create_empty_dir_as_root(RUN_FIREJAIL_LIB_DIR, 0755); | ||
67 | } | ||
68 | |||
69 | if (stat(RUN_MNT_DIR, &s)) { | 65 | if (stat(RUN_MNT_DIR, &s)) { |
70 | create_empty_dir_as_root(RUN_MNT_DIR, 0755); | 66 | create_empty_dir_as_root(RUN_MNT_DIR, 0755); |
71 | } | 67 | } |
72 | 68 | ||
73 | create_empty_file_as_root(RUN_RO_FILE, S_IRUSR); | 69 | create_empty_file_as_root(RUN_RO_FILE, S_IRUSR); |
74 | create_empty_dir_as_root(RUN_RO_DIR, S_IRUSR); | 70 | create_empty_dir_as_root(RUN_RO_DIR, S_IRUSR); |
75 | |||
76 | // bind-mount firejail binaries and helper programs | ||
77 | if (mount(LIBDIR, RUN_FIREJAIL_LIB_DIR, "none", MS_BIND, NULL) < 0) | ||
78 | errExit("mounting " RUN_FIREJAIL_LIB_DIR); | ||
79 | } | 71 | } |
80 | 72 | ||
81 | // build /run/firejail/mnt directory | 73 | // build /run/firejail/mnt directory |