Change bootstrap name to nacl

diff --git a/policy/modules/apps/chrome.fc b/policy/modules/apps/chrome.fc
index 4401c36647f422543a33268a6c0f4954ab7852f8..5901e21d218a4b3e7d3e73f4029ed91131f49379 100644 (file)
--- a/policy/modules/apps/chrome.fc
+++ b/policy/modules/apps/chrome.fc
@@ -2,5 +2,5 @@
 
 /usr/lib/chromium-browser/chrome-sandbox       --      gen_context(system_u:object_r:chrome_sandbox_exec_t,s0)
 
-/opt/google/chrome/nacl_helper_bootstrap       --      gen_context(system_u:object_r:chrome_sandbox_bootstrap_exec_t,s0)
-/usr/lib/chromium-browser/nacl_helper_bootstrap        --      gen_context(system_u:object_r:chrome_sandbox_bootstrap_exec_t,s0)
+/opt/google/chrome/nacl_helper_bootstrap       --      gen_context(system_u:object_r:chrome_sandbox_nacl_exec_t,s0)
+/usr/lib/chromium-browser/nacl_helper_bootstrap        --      gen_context(system_u:object_r:chrome_sandbox_nacl_exec_t,s0)

diff --git a/policy/modules/apps/chrome.if b/policy/modules/apps/chrome.if
index 744c80917248667d3c651849da5dfd88aa1feae8..7cbe3a7f27173b994542a96fe10deb3b0a51d2a5 100644 (file)
--- a/policy/modules/apps/chrome.if
+++ b/policy/modules/apps/chrome.if
@@ -46,12 +46,12 @@ interface(`chrome_domtrans_sandbox',`
 interface(`chrome_run_sandbox',`
        gen_require(`
                type chrome_sandbox_t;
-               type chrome_sandbox_bootstrap_t;
+               type chrome_sandbox_nacl_t;
        ')
 
        chrome_domtrans_sandbox($1)
        role $2 types chrome_sandbox_t;
-       role $2 types chrome_sandbox_bootstrap_t;
+       role $2 types chrome_sandbox_nacl_t;
 ')
 
 ########################################
@@ -73,11 +73,11 @@ interface(`chrome_role_notrans',`
        gen_require(`
                type chrome_sandbox_t;
                type chrome_sandbox_tmpfs_t;
-               type chrome_sandbox_bootstrap_t;
+               type chrome_sandbox_nacl_t;
        ')
 
        role $1 types chrome_sandbox_t;
-       role $1 types chrome_sandbox_bootstrap_t;
+       role $1 types chrome_sandbox_nacl_t;
 
        ps_process_pattern($2, chrome_sandbox_t)
        allow $2 chrome_sandbox_t:process signal_perms;

diff --git a/policy/modules/apps/chrome.te b/policy/modules/apps/chrome.te
index e4b338199226cee8103c899fd0388e06a734a773..9eeb8bb838253a3a3eb9bc65df24e314147abf15 100644 (file)
--- a/policy/modules/apps/chrome.te
+++ b/policy/modules/apps/chrome.te
@@ -17,12 +17,12 @@ type chrome_sandbox_tmpfs_t;
 files_tmpfs_file(chrome_sandbox_tmpfs_t)
 ubac_constrained(chrome_sandbox_tmpfs_t)
 
-type chrome_sandbox_bootstrap_t;
-type chrome_sandbox_bootstrap_exec_t;
-application_domain(chrome_sandbox_bootstrap_t, chrome_sandbox_bootstrap_exec_t)
-role system_r types chrome_sandbox_bootstrap_t;
+type chrome_sandbox_nacl_t;
+type chrome_sandbox_nacl_exec_t;
+application_domain(chrome_sandbox_nacl_t, chrome_sandbox_nacl_exec_t)
+role system_r types chrome_sandbox_nacl_t;
 
-permissive chrome_sandbox_bootstrap_t;
+permissive chrome_sandbox_nacl_t;
 
 ########################################
 #
@@ -135,18 +135,18 @@ optional_policy(`
 
 ########################################
 #
-# chrome_sandbox_bootstrap local policy
+# chrome_sandbox_nacl local policy
 #
 
-allow chrome_sandbox_bootstrap_t self:fifo_file manage_fifo_file_perms;
-allow chrome_sandbox_bootstrap_t self:unix_stream_socket create_stream_socket_perms;
-domain_use_interactive_fds(chrome_sandbox_bootstrap_t)
-allow chrome_sandbox_t chrome_sandbox_bootstrap_t:process share;
+allow chrome_sandbox_nacl_t self:fifo_file manage_fifo_file_perms;
+allow chrome_sandbox_nacl_t self:unix_stream_socket create_stream_socket_perms;
+domain_use_interactive_fds(chrome_sandbox_nacl_t)
+allow chrome_sandbox_t chrome_sandbox_nacl_t:process share;
 
-dontaudit chrome_sandbox_bootstrap_t self:memprotect mmap_zero;
+dontaudit chrome_sandbox_nacl_t self:memprotect mmap_zero;
 
-domtrans_pattern(chrome_sandbox_t, chrome_sandbox_bootstrap_exec_t, chrome_sandbox_bootstrap_t)
+domtrans_pattern(chrome_sandbox_t, chrome_sandbox_nacl_exec_t, chrome_sandbox_nacl_t)
 
-files_read_etc_files(chrome_sandbox_bootstrap_t)
+files_read_etc_files(chrome_sandbox_nacl_t)
 
-miscfiles_read_localization(chrome_sandbox_bootstrap_t)
+miscfiles_read_localization(chrome_sandbox_nacl_t)