Merge with upsteam

This commit is contained in:
Dan Walsh 2010-09-03 17:19:55 -04:00
parent cdda8feee0
commit f00ba23b21
2 changed files with 5 additions and 3 deletions

View File

@ -1,4 +1,4 @@
HOME_DIR/\.asoundrc -- gen_context(system_u:object_r:alsa_home_t,s0) HOME_DIR/\.asoundrc -- gen_context(system_u:object_r:alsa_home_t,s0)
/bin/alsaunmute -- gen_context(system_u:object_r:alsa_exec_t,s0) /bin/alsaunmute -- gen_context(system_u:object_r:alsa_exec_t,s0)

View File

@ -1,5 +1,7 @@
/dev/shm -d gen_context(system_u:object_r:tmpfs_t,s0) /dev/shm -d gen_context(system_u:object_r:tmpfs_t,s0)
/dev/shm/.* <<none>> /dev/shm/.* <<none>>
/cgroup(/.*)? gen_context(system_u:object_r:cgroup_t,s0) /cgroup -d gen_context(system_u:object_r:cgroup_t,s0)
/sys/fs/cgroup(/.*)? <<none>> /cgroup/.* <<none>>
/sys/fs/cgroup(/.*)? <<none>>