I am moving to remove consoletype policy package altogether from the system. I want...

diff --git a/policy/modules/admin/consoletype.te b/policy/modules/admin/consoletype.te
index 50e9ee44a2bd5a9d205ada9a5d15af85bc5e055b..72417f595fba9ac09f9b59ff6d655b0819fa25fe 100644 (file)
--- a/policy/modules/admin/consoletype.te
+++ b/policy/modules/admin/consoletype.te
@@ -7,8 +7,8 @@ policy_module(consoletype, 1.10.0)
 
 type consoletype_t;
 type consoletype_exec_t;
-init_domain(consoletype_t, consoletype_exec_t)
-init_system_domain(consoletype_t, consoletype_exec_t)
+application_domain(consoletype_t, consoletype_exec_t)
+role system_r types consoletype_t;
 
 ########################################
 #

diff --git a/policy/modules/admin/firstboot.te b/policy/modules/admin/firstboot.te
index f808287501757c7cf7a1ba6ef62f9e66058b09e9..bd59f2e1295c86db30a3be209bc43fcab585348b 100644 (file)
--- a/policy/modules/admin/firstboot.te
+++ b/policy/modules/admin/firstboot.te
@@ -96,10 +96,6 @@ userdom_manage_user_home_content_sockets(firstboot_t)
 userdom_home_filetrans_user_home_dir(firstboot_t)
 userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
 
-optional_policy(`
-       consoletype_domtrans(firstboot_t)
-')
-
 optional_policy(`
        dbus_system_bus_client(firstboot_t)
 

diff --git a/policy/modules/apps/usernetctl.if b/policy/modules/apps/usernetctl.if
index ba9b9d6ac8a2c41b3c056736833e5bcda69be3a0..09ae47c23957f90e8f7b1efed01cdc6114dd1594 100644 (file)
--- a/policy/modules/apps/usernetctl.if
+++ b/policy/modules/apps/usernetctl.if
@@ -46,10 +46,6 @@ interface(`usernetctl_run',`
        sysnet_run_ifconfig(usernetctl_t, $2)
        sysnet_run_dhcpc(usernetctl_t, $2)
 
-       optional_policy(`
-               consoletype_run(usernetctl_t, $2)
-       ')
-
        optional_policy(`
                iptables_run(usernetctl_t, $2)
        ')

diff --git a/policy/modules/apps/usernetctl.te b/policy/modules/apps/usernetctl.te
index f93802426b5eeafb49c126a8a04117247451214b..93edd6b9e2e24192633c5c24bcaab9d3a63ed2e6 100644 (file)
--- a/policy/modules/apps/usernetctl.te
+++ b/policy/modules/apps/usernetctl.te
@@ -60,6 +60,10 @@ sysnet_read_config(usernetctl_t)
 
 userdom_use_inherited_user_terminals(usernetctl_t)
 
+optional_policy(`
+       consoletype_exec(usernetctl_t)
+')
+
 optional_policy(`
        hostname_exec(usernetctl_t)
 ')

diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
index 86e7ab83120de08b0ae1baf8b23930ccf3e04b6f..0d1af63e42aa30648237664fb3274579510ae788 100644 (file)
--- a/policy/modules/roles/sysadm.te
+++ b/policy/modules/roles/sysadm.te
@@ -144,7 +144,7 @@ optional_policy(`
 ')
 
 optional_policy(`
-       consoletype_run(sysadm_t, sysadm_r)
+       consoletype_exec(sysadm_t)
 ')
 
 optional_policy(`

diff --git a/policy/modules/services/networkmanager.te b/policy/modules/services/networkmanager.te
index d1dcb941b86268cae545fdbd079a30d920fe894d..e5fb25815b698d7376ceee93e49fad4821ebba7a 100644 (file)
--- a/policy/modules/services/networkmanager.te
+++ b/policy/modules/services/networkmanager.te
@@ -209,7 +209,7 @@ optional_policy(`
 ')
 
 optional_policy(`
-       consoletype_domtrans(NetworkManager_t)
+       consoletype_exec(NetworkManager_t)
 ')
 
 optional_policy(`

diff --git a/policy/modules/services/puppet.te b/policy/modules/services/puppet.te
index 4dd777f92cad649242fc18c869ca32d563c49934..f36c2102360ab2c38e5d47ef960c9480e31188f0 100644 (file)
--- a/policy/modules/services/puppet.te
+++ b/policy/modules/services/puppet.te
@@ -160,7 +160,7 @@ optional_policy(`
 ')
 
 optional_policy(`
-       consoletype_domtrans(puppet_t)
+       consoletype_exec(puppet_t)
 ')
 
 optional_policy(`

diff --git a/policy/modules/system/sysnetwork.if b/policy/modules/system/sysnetwork.if
index be800dfcc7b53fd194d695ae84d835e8e36c386f..22c9f0d733dd56027340f2e661b05cf2519564db 100644 (file)
--- a/policy/modules/system/sysnetwork.if
+++ b/policy/modules/system/sysnetwork.if
@@ -48,10 +48,6 @@ interface(`sysnet_run_dhcpc',`
 
        sysnet_run_ifconfig(dhcpc_t, $2)
 
-       optional_policy(`
-               consoletype_run(dhcpc_t, $2)
-       ')
-
        optional_policy(`
                hostname_run(dhcpc_t, $2)
        ')

diff --git a/policy/modules/system/sysnetwork.te b/policy/modules/system/sysnetwork.te
index 50ad085c132248529bf89c191696a4cd0b587e5d..8aa390826cde073b18b2617c81b7c1c620050e5d 100644 (file)
--- a/policy/modules/system/sysnetwork.te
+++ b/policy/modules/system/sysnetwork.te
@@ -173,7 +173,7 @@ ifdef(`distro_ubuntu',`
 ')
 
 optional_policy(`
-       consoletype_domtrans(dhcpc_t)
+       consoletype_exec(dhcpc_t)
 ')
 
 optional_policy(`

diff --git a/policy/modules/system/udev.te b/policy/modules/system/udev.te
index bdb905ac7948dd24b79b22eb0fb2200f7792018a..6a93c644be3ff2e394a5d0784a0ea2c5b1901834 100644 (file)
--- a/policy/modules/system/udev.te
+++ b/policy/modules/system/udev.te
@@ -244,7 +244,7 @@ optional_policy(`
 ')
 
 optional_policy(`
-       consoletype_domtrans(udev_t)
+       consoletype_exec(udev_t)
 ')
 
 optional_policy(`