aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2020-03-15 13:39:24 +0100
committerLibravatar GitHub <noreply@github.com>2020-03-15 13:39:24 +0100
commitace47d9394b8bcb57d1801e93e0828be4bc1ef89 (patch)
tree3469c204481423aab8505b3bbdbc507ab7ee1fd2 /src
parentsteam fixes; #841, #3267 (diff)
parentnew condition: HAS_NOSOUND (diff)
downloadfirejail-ace47d9394b8bcb57d1801e93e0828be4bc1ef89.tar.gz
firejail-ace47d9394b8bcb57d1801e93e0828be4bc1ef89.tar.zst
firejail-ace47d9394b8bcb57d1801e93e0828be4bc1ef89.zip
Merge pull request #3278 from rusty-snake/has-nosound-condition
new condition: HAS_NOSOUND
Diffstat (limited to 'src')
-rw-r--r--src/firejail/profile.c5
-rw-r--r--src/man/firejail-profile.txt2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 969209869..c7269857d 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -151,6 +151,10 @@ static int check_nodbus(void) {
151 return arg_nodbus != 0; 151 return arg_nodbus != 0;
152} 152}
153 153
154static int check_nosound(void) {
155 return arg_nosound != 0;
156}
157
154static int check_x11(void) { 158static int check_x11(void) {
155 return (arg_x11_block || arg_x11_xorg || getenv("FIREJAIL_X11")); 159 return (arg_x11_block || arg_x11_xorg || getenv("FIREJAIL_X11"));
156} 160}
@@ -167,6 +171,7 @@ Cond conditionals[] = {
167 {"HAS_APPIMAGE", check_appimage}, 171 {"HAS_APPIMAGE", check_appimage},
168 {"HAS_NET", check_netoptions}, 172 {"HAS_NET", check_netoptions},
169 {"HAS_NODBUS", check_nodbus}, 173 {"HAS_NODBUS", check_nodbus},
174 {"HAS_NOSOUND", check_nosound},
170 {"HAS_X11", check_x11}, 175 {"HAS_X11", check_x11},
171 {"BROWSER_DISABLE_U2F", check_disable_u2f}, 176 {"BROWSER_DISABLE_U2F", check_disable_u2f},
172 {"BROWSER_ALLOW_DRM", check_allow_drm}, 177 {"BROWSER_ALLOW_DRM", check_allow_drm},
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 84aed41a4..9af25bf63 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -103,7 +103,7 @@ Example: "?HAS_APPIMAGE: whitelist ${HOME}/special/appimage/dir"
103 103
104This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line. 104This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line.
105 105
106Currently the only conditionals supported this way are HAS_APPIMAGE, HAS_NET, HAS_NODBUS and HAS_X11. The conditionals BROWSER_DISABLE_U2F and BROWSER_ALLOW_DRM 106Currently the only conditionals supported this way are HAS_APPIMAGE, HAS_NET, HAS_NODBUS, HAS_NOSOUND and HAS_X11. The conditionals BROWSER_DISABLE_U2F and BROWSER_ALLOW_DRM
107can be enabled or disabled globally in Firejail's configuration file. 107can be enabled or disabled globally in Firejail's configuration file.
108 108
109The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines. 109The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines.