diff options
author | netblue30 <netblue30@protonmail.com> | 2021-02-26 07:40:15 -0500 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2021-02-26 07:40:15 -0500 |
commit | 9bb17798a44b68e32ea5acb2702c878f68919e0d (patch) | |
tree | 892be37a73c7729110de575a61493de041c39f14 | |
parent | Merge pull request #4009 from Tomin1/protocol_list_improvements (diff) | |
download | firejail-9bb17798a44b68e32ea5acb2702c878f68919e0d.tar.gz firejail-9bb17798a44b68e32ea5acb2702c878f68919e0d.tar.zst firejail-9bb17798a44b68e32ea5acb2702c878f68919e0d.zip |
mkdir/mkfile man pages
-rw-r--r-- | RELNOTES | 1 | ||||
-rw-r--r-- | src/firejail/usage.c | 4 | ||||
-rw-r--r-- | src/firejail/util.c | 2 | ||||
-rw-r--r-- | src/man/firejail.txt | 20 |
4 files changed, 25 insertions, 2 deletions
@@ -1,6 +1,7 @@ | |||
1 | firejail (0.9.65) baseline; urgency=low | 1 | firejail (0.9.65) baseline; urgency=low |
2 | * filtering environment variables | 2 | * filtering environment variables |
3 | * zsh completion | 3 | * zsh completion |
4 | * --mkdir, --mkfile | ||
4 | * new profiles: vmware-view, display-im6.q16, ipcalc, ipcalc-ng | 5 | * new profiles: vmware-view, display-im6.q16, ipcalc, ipcalc-ng |
5 | * ebook-convert, ebook-edit, ebook-meta, ebook-polish, lzop | 6 | * ebook-convert, ebook-edit, ebook-meta, ebook-polish, lzop |
6 | * gget | 7 | * gget |
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index 1ac30299a..adba5da40 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -125,6 +125,8 @@ static char *usage_str = | |||
125 | " --machine-id - preserve /etc/machine-id\n" | 125 | " --machine-id - preserve /etc/machine-id\n" |
126 | " --memory-deny-write-execute - seccomp filter to block attempts to create\n" | 126 | " --memory-deny-write-execute - seccomp filter to block attempts to create\n" |
127 | "\tmemory mappings that are both writable and executable.\n" | 127 | "\tmemory mappings that are both writable and executable.\n" |
128 | " --mkdir=dirname - create a directory.\n" | ||
129 | " --mkfile=filename - create a file.\n" | ||
128 | #ifdef HAVE_NETWORK | 130 | #ifdef HAVE_NETWORK |
129 | " --mtu=number - set interface MTU.\n" | 131 | " --mtu=number - set interface MTU.\n" |
130 | #endif | 132 | #endif |
@@ -246,8 +248,6 @@ static char *usage_str = | |||
246 | #ifdef HAVE_WHITELIST | 248 | #ifdef HAVE_WHITELIST |
247 | " --whitelist=filename - whitelist directory or file.\n" | 249 | " --whitelist=filename - whitelist directory or file.\n" |
248 | #endif | 250 | #endif |
249 | " --mkdir=dirname - create a directory.\n" | ||
250 | " --mkfile=filename - create a file.\n" | ||
251 | " --writable-etc - /etc directory is mounted read-write.\n" | 251 | " --writable-etc - /etc directory is mounted read-write.\n" |
252 | " --writable-run-user - allow access to /run/user/$UID/systemd and\n" | 252 | " --writable-run-user - allow access to /run/user/$UID/systemd and\n" |
253 | "\t/run/user/$UID/gnupg.\n" | 253 | "\t/run/user/$UID/gnupg.\n" |
diff --git a/src/firejail/util.c b/src/firejail/util.c index f3709b5fd..53c671794 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -400,6 +400,8 @@ void touch_file_as_user(const char *fname, mode_t mode) { | |||
400 | SET_PERMS_STREAM(fp, -1, -1, mode); | 400 | SET_PERMS_STREAM(fp, -1, -1, mode); |
401 | fclose(fp); | 401 | fclose(fp); |
402 | } | 402 | } |
403 | else | ||
404 | fwarning("cannot create %s\n", fname); | ||
403 | #ifdef HAVE_GCOV | 405 | #ifdef HAVE_GCOV |
404 | __gcov_flush(); | 406 | __gcov_flush(); |
405 | #endif | 407 | #endif |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 9e89d4e79..81bd5a049 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -1105,6 +1105,26 @@ Example: | |||
1105 | $ firejail \-\-machine-id | 1105 | $ firejail \-\-machine-id |
1106 | 1106 | ||
1107 | .TP | 1107 | .TP |
1108 | \fB\-\-mkdir=dirname | ||
1109 | Create a directory in user home. Parent directories are created as needed. | ||
1110 | .br | ||
1111 | |||
1112 | .br | ||
1113 | Example: | ||
1114 | .br | ||
1115 | $ firejail --mkdir=~/work/project | ||
1116 | |||
1117 | .TP | ||
1118 | \fB\-\-mkfile=filename | ||
1119 | Create an empty file in user home. | ||
1120 | .br | ||
1121 | |||
1122 | .br | ||
1123 | Example: | ||
1124 | .br | ||
1125 | $ firejail --mkfile=~/work/project/readme | ||
1126 | |||
1127 | .TP | ||
1108 | \fB\-\-memory-deny-write-execute | 1128 | \fB\-\-memory-deny-write-execute |
1109 | Install a seccomp filter to block attempts to create memory mappings | 1129 | Install a seccomp filter to block attempts to create memory mappings |
1110 | that are both writable and executable, to change mappings to be | 1130 | that are both writable and executable, to change mappings to be |