rename arg_noautopulse var to arg_keep_config_pulse

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
 extern int arg_scan;            // arp-scan all interfaces
 extern int arg_whitelist;       // whitelist command
 extern int arg_nosound; // disable sound
-extern int arg_noautopulse; // disable automatic ~/.config/pulse init
 extern int arg_novideo; //disable video devices in /dev
 extern int arg_no3d;            // disable 3d hardware acceleration
 extern int arg_quiet;           // no output for scripting
@@ -323,6 +322,7 @@ extern int arg_join_filesystem;	// join only the mount namespace
 extern int arg_nice;            // nice value configured
 extern int arg_ipc;             // enable ipc namespace
 extern int arg_writable_etc;    // writable etc
+extern int arg_keep_config_pulse;       // disable automatic ~/.config/pulse init
 extern int arg_writable_var;    // writable var
 extern int arg_keep_var_tmp; // don't overwrite /var/tmp
 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
 int arg_scan = 0;                               // arp-scan all interfaces
 int arg_whitelist = 0;                          // whitelist command
 int arg_nosound = 0;                            // disable sound
-int arg_noautopulse = 0;                        // disable automatic ~/.config/pulse init
 int arg_novideo = 0;                    //disable video devices in /dev
 int arg_no3d;                                   // disable 3d hardware acceleration
 int arg_quiet = 0;                              // no output for scripting
@@ -125,6 +124,7 @@ int arg_join_filesystem = 0;			// join only the mount namespace
 int arg_nice = 0;                               // nice value configured
 int arg_ipc = 0;                                        // enable ipc namespace
 int arg_writable_etc = 0;                       // writable etc
+int arg_keep_config_pulse = 0;                  // disable automatic ~/.config/pulse init
 int arg_writable_var = 0;                       // writable var
 int arg_keep_var_tmp = 0;                       // don't overwrite /var/tmp
 int arg_writable_run_user = 0;                  // writable /run/user
@@ -1824,8 +1824,8 @@ int main(int argc, char **argv, char **envp) {
                                 exit(1);
                         }
                         arg_noprofile = 1;
-                        // force noautopulse in order to keep ~/.config/pulse as is
-                        arg_noautopulse = 1;
+                        // force keep-config-pulse in order to keep ~/.config/pulse as is
+                        arg_keep_config_pulse = 1;
                 }
                 else if (strncmp(argv[i], "--ignore=", 9) == 0) {
                         if (custom_profile) {
@@ -1877,7 +1877,7 @@ int main(int argc, char **argv, char **envp) {
                         arg_writable_etc = 1;
                 }
                 else if (strcmp(argv[i], "--keep-config-pulse") == 0) {
-                        arg_noautopulse = 1;
+                        arg_keep_config_pulse = 1;
                 }
                 else if (strcmp(argv[i], "--writable-var") == 0) {
                         arg_writable_var = 1;
@@ -2081,7 +2081,7 @@ int main(int argc, char **argv, char **envp) {
                 else if (strcmp(argv[i], "--nosound") == 0)
                         arg_nosound = 1;
                 else if (strcmp(argv[i], "--noautopulse") == 0)
-                        arg_noautopulse = 1;
+                        arg_keep_config_pulse = 1;
                 else if (strcmp(argv[i], "--novideo") == 0)
                         arg_novideo = 1;
                 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) {
                 return 0;
         }
         else if (strcmp(ptr, "noautopulse") == 0) {
-                arg_noautopulse = 1;
+                arg_keep_config_pulse = 1;
                 return 0;
         }
         else if (strcmp(ptr, "notv") == 0) {
@@ -1145,7 +1145,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
         }
 
         if (strcmp(ptr, "keep-config-pulse") == 0) {
-                arg_noautopulse = 1;
+                arg_keep_config_pulse = 1;
                 return 0;
         }
 
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) {
                 // disable /dev/snd
                 fs_dev_disable_sound();
         }
-        else if (!arg_noautopulse)
+        else if (!arg_keep_config_pulse)
                 pulseaudio_init();
 
         if (arg_no3d)