aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-04-12 08:59:59 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-04-12 08:59:59 -0400
commit90c1f897e7dcf174c302f29356f8d73082cbae47 (patch)
treef1eedfcc797828b15e15feede130c09f982536be /src
parentfixed sigterm forwarding (diff)
downloadfirejail-90c1f897e7dcf174c302f29356f8d73082cbae47.tar.gz
firejail-90c1f897e7dcf174c302f29356f8d73082cbae47.tar.zst
firejail-90c1f897e7dcf174c302f29356f8d73082cbae47.zip
added /usr/local/bin to private-bin
Diffstat (limited to 'src')
-rw-r--r--src/firejail/fs_bin.c3
-rw-r--r--src/firejail/sandbox.c1
-rw-r--r--src/firejail/usage.c3
-rw-r--r--src/man/firejail.txt2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index d218f2852..fe1ac9243 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -25,9 +25,10 @@
25#include <unistd.h> 25#include <unistd.h>
26 26
27static char *paths[] = { 27static char *paths[] = {
28 "/usr/local/bin",
28 "/bin", 29 "/bin",
29 "/sbin",
30 "/usr/bin", 30 "/usr/bin",
31 "/sbin",
31 "/usr/sbin", 32 "/usr/sbin",
32 NULL 33 NULL
33}; 34};
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 70a356058..4a4956687 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -204,7 +204,6 @@ static int monitor_application(pid_t app_pid) {
204 if (monitored_pid != 0 && arg_debug) 204 if (monitored_pid != 0 && arg_debug)
205 printf("Sandbox monitor: monitoring %u\n", monitored_pid); 205 printf("Sandbox monitor: monitoring %u\n", monitored_pid);
206 } 206 }
207printf("blablabla\n");
208 207
209 // return the latest exit status. 208 // return the latest exit status.
210 return status; 209 return status;
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 3e4a0d1c3..539785f21 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -180,8 +180,7 @@ void usage(void) {
180 printf(" --private=directory - use directory as user home.\n\n"); 180 printf(" --private=directory - use directory as user home.\n\n");
181 181
182 printf(" --private-bin=file,file - build a new /bin in a temporary filesystem,\n"); 182 printf(" --private-bin=file,file - build a new /bin in a temporary filesystem,\n");
183 printf("\tand copy the programs in the list. The same directory is\n"); 183 printf("\tand copy the programs in the list.\n\n");
184 printf("\talso bind-mounted over /sbin, /usr/bin and /usr/sbin.\n\n");
185 184
186 printf(" --private-dev - create a new /dev directory. Only dri, null, full, zero,\n"); 185 printf(" --private-dev - create a new /dev directory. Only dri, null, full, zero,\n");
187 printf("\ttty, pst, ptms, random, urandom, log and shm devices are available.\n\n"); 186 printf("\ttty, pst, ptms, random, urandom, log and shm devices are available.\n\n");
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 60c53378a..23db832c1 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1000,7 +1000,7 @@ $ firejail \-\-private=/home/netblue/firefox-home firefox
1000.TP 1000.TP
1001\fB\-\-private-bin=file,file 1001\fB\-\-private-bin=file,file
1002Build a new /bin in a temporary filesystem, and copy the programs in the list. 1002Build a new /bin in a temporary filesystem, and copy the programs in the list.
1003The same directory is also bind-mounted over /sbin, /usr/bin and /usr/sbin. 1003The same directory is also bind-mounted over /sbin, /usr/bin, /usr/sbin and /usr/local/bin.
1004.br 1004.br
1005 1005
1006.br 1006.br