diff options
author | 2021-05-13 21:13:24 -0300 | |
---|---|---|
committer | 2021-05-14 08:56:02 -0300 | |
commit | b7015edb02e06e26700fd23722b3c47b26063d2b (patch) | |
tree | 6df58a09dd296cd99d6fd40a2ac6943d2667c993 | |
parent | rename noautopulse to keep-config-pulse (diff) | |
download | firejail-b7015edb02e06e26700fd23722b3c47b26063d2b.tar.gz firejail-b7015edb02e06e26700fd23722b3c47b26063d2b.tar.zst firejail-b7015edb02e06e26700fd23722b3c47b26063d2b.zip |
rename arg_noautopulse var to arg_keep_config_pulse
-rw-r--r-- | src/firejail/firejail.h | 2 | ||||
-rw-r--r-- | src/firejail/main.c | 10 | ||||
-rw-r--r-- | src/firejail/profile.c | 4 | ||||
-rw-r--r-- | src/firejail/sandbox.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index e07035ae6..ac2fd279e 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -314,7 +314,6 @@ extern int arg_private_cwd; // private working directory | |||
314 | extern int arg_scan; // arp-scan all interfaces | 314 | extern int arg_scan; // arp-scan all interfaces |
315 | extern int arg_whitelist; // whitelist command | 315 | extern int arg_whitelist; // whitelist command |
316 | extern int arg_nosound; // disable sound | 316 | extern int arg_nosound; // disable sound |
317 | extern int arg_noautopulse; // disable automatic ~/.config/pulse init | ||
318 | extern int arg_novideo; //disable video devices in /dev | 317 | extern int arg_novideo; //disable video devices in /dev |
319 | extern int arg_no3d; // disable 3d hardware acceleration | 318 | extern int arg_no3d; // disable 3d hardware acceleration |
320 | extern int arg_quiet; // no output for scripting | 319 | extern int arg_quiet; // no output for scripting |
@@ -323,6 +322,7 @@ extern int arg_join_filesystem; // join only the mount namespace | |||
323 | extern int arg_nice; // nice value configured | 322 | extern int arg_nice; // nice value configured |
324 | extern int arg_ipc; // enable ipc namespace | 323 | extern int arg_ipc; // enable ipc namespace |
325 | extern int arg_writable_etc; // writable etc | 324 | extern int arg_writable_etc; // writable etc |
325 | extern int arg_keep_config_pulse; // disable automatic ~/.config/pulse init | ||
326 | extern int arg_writable_var; // writable var | 326 | extern int arg_writable_var; // writable var |
327 | extern int arg_keep_var_tmp; // don't overwrite /var/tmp | 327 | extern int arg_keep_var_tmp; // don't overwrite /var/tmp |
328 | extern int arg_writable_run_user; // writable /run/user | 328 | extern int arg_writable_run_user; // writable /run/user |
diff --git a/src/firejail/main.c b/src/firejail/main.c index 389eeeae9..1914bdcae 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -116,7 +116,6 @@ int arg_private_cwd = 0; // private working directory | |||
116 | int arg_scan = 0; // arp-scan all interfaces | 116 | int arg_scan = 0; // arp-scan all interfaces |
117 | int arg_whitelist = 0; // whitelist command | 117 | int arg_whitelist = 0; // whitelist command |
118 | int arg_nosound = 0; // disable sound | 118 | int arg_nosound = 0; // disable sound |
119 | int arg_noautopulse = 0; // disable automatic ~/.config/pulse init | ||
120 | int arg_novideo = 0; //disable video devices in /dev | 119 | int arg_novideo = 0; //disable video devices in /dev |
121 | int arg_no3d; // disable 3d hardware acceleration | 120 | int arg_no3d; // disable 3d hardware acceleration |
122 | int arg_quiet = 0; // no output for scripting | 121 | int arg_quiet = 0; // no output for scripting |
@@ -125,6 +124,7 @@ int arg_join_filesystem = 0; // join only the mount namespace | |||
125 | int arg_nice = 0; // nice value configured | 124 | int arg_nice = 0; // nice value configured |
126 | int arg_ipc = 0; // enable ipc namespace | 125 | int arg_ipc = 0; // enable ipc namespace |
127 | int arg_writable_etc = 0; // writable etc | 126 | int arg_writable_etc = 0; // writable etc |
127 | int arg_keep_config_pulse = 0; // disable automatic ~/.config/pulse init | ||
128 | int arg_writable_var = 0; // writable var | 128 | int arg_writable_var = 0; // writable var |
129 | int arg_keep_var_tmp = 0; // don't overwrite /var/tmp | 129 | int arg_keep_var_tmp = 0; // don't overwrite /var/tmp |
130 | int arg_writable_run_user = 0; // writable /run/user | 130 | int arg_writable_run_user = 0; // writable /run/user |
@@ -1824,8 +1824,8 @@ int main(int argc, char **argv, char **envp) { | |||
1824 | exit(1); | 1824 | exit(1); |
1825 | } | 1825 | } |
1826 | arg_noprofile = 1; | 1826 | arg_noprofile = 1; |
1827 | // force noautopulse in order to keep ~/.config/pulse as is | 1827 | // force keep-config-pulse in order to keep ~/.config/pulse as is |
1828 | arg_noautopulse = 1; | 1828 | arg_keep_config_pulse = 1; |
1829 | } | 1829 | } |
1830 | else if (strncmp(argv[i], "--ignore=", 9) == 0) { | 1830 | else if (strncmp(argv[i], "--ignore=", 9) == 0) { |
1831 | if (custom_profile) { | 1831 | if (custom_profile) { |
@@ -1877,7 +1877,7 @@ int main(int argc, char **argv, char **envp) { | |||
1877 | arg_writable_etc = 1; | 1877 | arg_writable_etc = 1; |
1878 | } | 1878 | } |
1879 | else if (strcmp(argv[i], "--keep-config-pulse") == 0) { | 1879 | else if (strcmp(argv[i], "--keep-config-pulse") == 0) { |
1880 | arg_noautopulse = 1; | 1880 | arg_keep_config_pulse = 1; |
1881 | } | 1881 | } |
1882 | else if (strcmp(argv[i], "--writable-var") == 0) { | 1882 | else if (strcmp(argv[i], "--writable-var") == 0) { |
1883 | arg_writable_var = 1; | 1883 | arg_writable_var = 1; |
@@ -2081,7 +2081,7 @@ int main(int argc, char **argv, char **envp) { | |||
2081 | else if (strcmp(argv[i], "--nosound") == 0) | 2081 | else if (strcmp(argv[i], "--nosound") == 0) |
2082 | arg_nosound = 1; | 2082 | arg_nosound = 1; |
2083 | else if (strcmp(argv[i], "--noautopulse") == 0) | 2083 | else if (strcmp(argv[i], "--noautopulse") == 0) |
2084 | arg_noautopulse = 1; | 2084 | arg_keep_config_pulse = 1; |
2085 | else if (strcmp(argv[i], "--novideo") == 0) | 2085 | else if (strcmp(argv[i], "--novideo") == 0) |
2086 | arg_novideo = 1; | 2086 | arg_novideo = 1; |
2087 | else if (strcmp(argv[i], "--no3d") == 0) | 2087 | else if (strcmp(argv[i], "--no3d") == 0) |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index 3f90d7c1d..4f30fc4b1 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -423,7 +423,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
423 | return 0; | 423 | return 0; |
424 | } | 424 | } |
425 | else if (strcmp(ptr, "noautopulse") == 0) { | 425 | else if (strcmp(ptr, "noautopulse") == 0) { |
426 | arg_noautopulse = 1; | 426 | arg_keep_config_pulse = 1; |
427 | return 0; | 427 | return 0; |
428 | } | 428 | } |
429 | else if (strcmp(ptr, "notv") == 0) { | 429 | else if (strcmp(ptr, "notv") == 0) { |
@@ -1145,7 +1145,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
1145 | } | 1145 | } |
1146 | 1146 | ||
1147 | if (strcmp(ptr, "keep-config-pulse") == 0) { | 1147 | if (strcmp(ptr, "keep-config-pulse") == 0) { |
1148 | arg_noautopulse = 1; | 1148 | arg_keep_config_pulse = 1; |
1149 | return 0; | 1149 | return 0; |
1150 | } | 1150 | } |
1151 | 1151 | ||
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 3af828ede..40e644be8 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -1015,7 +1015,7 @@ int sandbox(void* sandbox_arg) { | |||
1015 | // disable /dev/snd | 1015 | // disable /dev/snd |
1016 | fs_dev_disable_sound(); | 1016 | fs_dev_disable_sound(); |
1017 | } | 1017 | } |
1018 | else if (!arg_noautopulse) | 1018 | else if (!arg_keep_config_pulse) |
1019 | pulseaudio_init(); | 1019 | pulseaudio_init(); |
1020 | 1020 | ||
1021 | if (arg_no3d) | 1021 | if (arg_no3d) |