aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--README.md25
-rw-r--r--src/firejail/usage.c3
-rw-r--r--src/man/firejail.txt33
4 files changed, 62 insertions, 0 deletions
diff --git a/README b/README
index 109a887ad..70577700c 100644
--- a/README
+++ b/README
@@ -85,6 +85,7 @@ Fred-Barclay (https://github.com/Fred-Barclay)
85 - added wireshark profile 85 - added wireshark profile
86 - uudeview profile fix 86 - uudeview profile fix
87 - fixed palemoon and qbittorrent profiles 87 - fixed palemoon and qbittorrent profiles
88 - compile/install scripts for --git-install/--git-uninstall commands
88valoq (https://github.com/valoq) 89valoq (https://github.com/valoq)
89 - lots of profile fixes 90 - lots of profile fixes
90 - added support for /srv in --whitelist feature 91 - added support for /srv in --whitelist feature
diff --git a/README.md b/README.md
index 07de69e42..696096924 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,31 @@ Added AppImage type 2 support, and support for passing command line arguments to
105 105
106 Example: 106 Example:
107 $ sudo firejail --writable-var-log 107 $ sudo firejail --writable-var-log
108
109 --git-install
110 Download, compile and install mainline git version of Firejail
111 from the official repository on GitHub. The software is
112 installed in /usr/local/bin, and takes precedence over the (old)
113 version installed in /usr/bin. If for any reason the new version
114 doesn't work, the user can uninstall it using --git-uninstall
115 command and revert to the old version.
116
117 Prerequisites: git and compile support are required for this com‐
118 mand to work. On Debian/Ubuntu systems this support is installed
119 using "sudo apt-get install build-essential git".
120
121 Example:
122
123 $ firejail --git-install
124
125 --git-uninstall
126 Remove the Firejail version previously installed in
127 /usr/local/bin using --git-install command.
128
129 Example:
130
131 $ firejail --git-uninstall
132
108 133
109````` 134`````
110## New Profiles 135## New Profiles
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 15ba22d4d..b9fff2011 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -76,6 +76,9 @@ void usage(void) {
76 printf(" --env=name=value - set environment variable.\n"); 76 printf(" --env=name=value - set environment variable.\n");
77 printf(" --fs.print=name|pid - print the filesystem log.\n"); 77 printf(" --fs.print=name|pid - print the filesystem log.\n");
78 printf(" --get=name|pid filename - get a file from sandbox container.\n"); 78 printf(" --get=name|pid filename - get a file from sandbox container.\n");
79 printf(" --git-install - download, compile and install mainline git version\n");
80 printf("\tof Firejail.\n");
81 printf(" --git-uninstall - uninstall mainline git version of Firejail\n");
79 printf(" --help, -? - this help screen.\n"); 82 printf(" --help, -? - this help screen.\n");
80 printf(" --hostname=name - set sandbox hostname.\n"); 83 printf(" --hostname=name - set sandbox hostname.\n");
81 printf(" --hosts-file=file - use file as /etc/hosts.\n"); 84 printf(" --hosts-file=file - use file as /etc/hosts.\n");
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 993186476..f978661dc 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -453,6 +453,39 @@ $ firejail \-\-fs.print=3272
453\fB\-\-get=name|pid filename 453\fB\-\-get=name|pid filename
454Get a file from sandbox container, see \fBFILE TRANSFER\fR section for more details. 454Get a file from sandbox container, see \fBFILE TRANSFER\fR section for more details.
455 455
456
457.TP
458\fB\-\-git-install
459Download, compile and install mainline git version of Firejail from the official repository on GitHub.
460The software is installed in /usr/local/bin, and takes precedence over the (old) version
461installed in /usr/bin. If for any reason the new version doesn't work, the user can uninstall it
462using \-\-git-uninstall command and revert to the old version.
463.br
464
465.br
466Prerequisites: git and compile support are required for this command to work. On Debian/Ubuntu
467systems this support is installed using "sudo apt-get install build-essential git".
468.br
469
470.br
471Example:
472.br
473
474.br
475$ firejail \-\-git-install
476
477.TP
478\fB\-\-git-uninstall
479Remove the Firejail version previously installed in /usr/local/bin using \-\-git-install command.
480.br
481
482.br
483Example:
484.br
485
486.br
487$ firejail \-\-git-uninstall
488
456.TP 489.TP
457\fB\-?\fR, \fB\-\-help\fR 490\fB\-?\fR, \fB\-\-help\fR
458Print options end exit. 491Print options end exit.