Merge pull request #373 from pebenito/systemd-tmpfiles-managed

This commit is contained in:
Chris PeBenito 2021-05-11 08:38:53 -04:00
commit 924e56c9e2
7 changed files with 18 additions and 16 deletions

View File

@ -23,7 +23,7 @@ fs_xattr_type(device_t)
fs_use_trans devtmpfs gen_context(system_u:object_r:device_t,s0); fs_use_trans devtmpfs gen_context(system_u:object_r:device_t,s0);
optional_policy(` optional_policy(`
systemd_tmpfilesd_managed(device_t, fifo_file) systemd_tmpfilesd_managed(device_t)
') ')
# #

View File

@ -183,7 +183,7 @@ files_runtime_file(var_run_t)
files_mountpoint(var_run_t) files_mountpoint(var_run_t)
optional_policy(` optional_policy(`
systemd_tmpfilesd_managed(var_run_t, lnk_file) systemd_tmpfilesd_managed(var_run_t)
') ')
# #

View File

@ -192,7 +192,7 @@ optional_policy(`
systemd_use_inherited_machined_ptys(system_dbusd_t) systemd_use_inherited_machined_ptys(system_dbusd_t)
# allow populating of /var/lib/dbus by systemd-tmpfilesd # allow populating of /var/lib/dbus by systemd-tmpfilesd
systemd_tmpfilesd_managed(system_dbusd_var_lib_t, dir) systemd_tmpfilesd_managed(system_dbusd_var_lib_t)
') ')
optional_policy(` optional_policy(`

View File

@ -97,8 +97,8 @@ type wtmp_t;
logging_log_file(wtmp_t) logging_log_file(wtmp_t)
optional_policy(` optional_policy(`
systemd_tmpfilesd_managed(faillog_t, { dir file }) systemd_tmpfilesd_managed(faillog_t)
systemd_tmpfilesd_managed(var_auth_t, dir) systemd_tmpfilesd_managed(var_auth_t)
') ')
######################################## ########################################

View File

@ -20,7 +20,7 @@ files_type(lvm_etc_t)
type lvm_lock_t; type lvm_lock_t;
files_lock_file(lvm_lock_t) files_lock_file(lvm_lock_t)
optional_policy(` optional_policy(`
systemd_tmpfilesd_managed(lvm_lock_t, dir) systemd_tmpfilesd_managed(lvm_lock_t)
') ')
type lvm_metadata_t; type lvm_metadata_t;

View File

@ -43,7 +43,7 @@ type man_t alias catman_t;
files_type(man_t) files_type(man_t)
optional_policy(` optional_policy(`
systemd_tmpfilesd_managed(man_t, dir) systemd_tmpfilesd_managed(man_t)
') ')
type man_cache_t; type man_cache_t;

View File

@ -1705,16 +1705,11 @@ interface(`systemd_relabelto_tmpfiles_conf_files',`
####################################### #######################################
## <summary> ## <summary>
## Allow systemd_tmpfiles_t to manage filesystem objects ## Allow systemd_tmpfiles_t to manage filesystem objects
## </summary> ## </summary>
## <param name="type"> ## <param name="type">
## <summary> ## <summary>
## type of object to manage ## Type of object to manage
## </summary>
## </param>
## <param name="class">
## <summary>
## object class to manage
## </summary> ## </summary>
## </param> ## </param>
# #
@ -1723,8 +1718,15 @@ interface(`systemd_tmpfilesd_managed',`
type systemd_tmpfiles_t; type systemd_tmpfiles_t;
') ')
allow systemd_tmpfiles_t $1:dir list_dir_perms; allow systemd_tmpfiles_t $1:dir { manage_dir_perms relabel_dir_perms };
allow systemd_tmpfiles_t $1:$2 { setattr relabelfrom relabelto create }; allow systemd_tmpfiles_t $1:file { create setattr unlink write_file_perms relabel_file_perms };
allow systemd_tmpfiles_t $1:lnk_file { create setattr unlink relabel_lnk_file_perms };
allow systemd_tmpfiles_t $1:fifo_file { create setattr unlink relabel_fifo_file_perms };
ifelse(`$2',`',`',`
refpolicywarn(`$0($*) second parameter is deprecated.')
allow systemd_tmpfiles_t $1:$2 { setattr relabelfrom relabelto create };
')
') ')
######################################## ########################################