aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-02-26 20:13:22 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-02-26 20:13:22 -0500
commit2a552f4d3af4a5c4aaef7ad9a0e500d6c6d462ed (patch)
tree7a49f0fe6d0d0fbda14d6f2268ed7594e99f24ee
parentfix todo (diff)
downloadfirejail-2a552f4d3af4a5c4aaef7ad9a0e500d6c6d462ed.tar.gz
firejail-2a552f4d3af4a5c4aaef7ad9a0e500d6c6d462ed.tar.zst
firejail-2a552f4d3af4a5c4aaef7ad9a0e500d6c6d462ed.zip
x11 support
-rw-r--r--README2
-rw-r--r--RELNOTES1
-rw-r--r--src/firejail/usage.c1
-rw-r--r--src/man/firejail.txt2
4 files changed, 4 insertions, 2 deletions
diff --git a/README b/README
index 6da1775f0..efc39d730 100644
--- a/README
+++ b/README
@@ -100,7 +100,7 @@ Duncan Overbruck (https://github.com/Duncaen)
100 - musl libc fix 100 - musl libc fix
101 - utmp fix 101 - utmp fix
102andrew160 (https://github.com/andrew160) 102andrew160 (https://github.com/andrew160)
103 - profile fixes 103 - profile and man pages fixes
104Loïc Damien (https://github.com/dzamlo) 104Loïc Damien (https://github.com/dzamlo)
105 - small fixes 105 - small fixes
106Matthew Gyurgyik (https://github.com/pyther) 106Matthew Gyurgyik (https://github.com/pyther)
diff --git a/RELNOTES b/RELNOTES
index 41edfa0f1..42e2f14d7 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -3,6 +3,7 @@ firejail (0.9.39) baseline; urgency=low
3 * default seccomp filter update 3 * default seccomp filter update
4 * disable STUN/WebRTC in default netfilter configuration 4 * disable STUN/WebRTC in default netfilter configuration
5 * added --nice option 5 * added --nice option
6 * added --x11 option
6 * addded mkdir profile command 7 * addded mkdir profile command
7 * --version also prints compile options 8 * --version also prints compile options
8 * added compile-time option to restrict --net= to root only 9 * added compile-time option to restrict --net= to root only
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 33724c80f..b538f136b 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -292,6 +292,7 @@ void usage(void) {
292 printf("\t--user=new_user - switch the user before starting the sandbox.\n\n"); 292 printf("\t--user=new_user - switch the user before starting the sandbox.\n\n");
293 printf("\t--version - print program version and exit.\n\n"); 293 printf("\t--version - print program version and exit.\n\n");
294 printf("\t--whitelist=dirname_or_filename - whitelist directory or file.\n\n"); 294 printf("\t--whitelist=dirname_or_filename - whitelist directory or file.\n\n");
295 printf("\t--x11 - enable x11 server.\n\n");
295 printf("\t--zsh - use /usr/bin/zsh as default shell.\n\n"); 296 printf("\t--zsh - use /usr/bin/zsh as default shell.\n\n");
296 printf("\n"); 297 printf("\n");
297 printf("\n"); 298 printf("\n");
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index c6931af12..eff2c5750 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1517,7 +1517,7 @@ applications started in the sandbox from accessing display 0.
1517.br 1517.br
1518Example: 1518Example:
1519.br 1519.br
1520$ firejail \-\-x11 firefox 1520$ firejail \-\-x11 --net=eth0 firefox
1521 1521
1522.TP 1522.TP
1523\fB\-\-zsh 1523\fB\-\-zsh