[refpolicy] Debian puts alsa config files in a different location

[Manoj Srivastava]

On Tue, Jul 14 2009, Christopher J. PeBenito wrote:

> On Wed, 2009-07-01 at 11:07 -0400, Manoj Srivastava wrote:
>
> This doesn't apply.  The var line doesn't seem necessary since there is
> a /var/lib/alsa(/.*) line upstream.  Can you update and check to see if
> that works?
>
> In this case, I'd keep the /usr/share/alsa lines you want to add in a
> distro_debian since they seem to be an odd location for a rw config
> file.

        This is against refpolicy git as of this morning.

        manoj

diff --git a/policy/modules/admin/alsa.fc b/policy/modules/admin/alsa.fc
index 545a817..a534b56 100644
--- a/policy/modules/admin/alsa.fc
+++ b/policy/modules/admin/alsa.fc
@@ -1,9 +1,15 @@
 /bin/alsaunmute		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 
-/etc/alsa/asound\.state --	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
-/etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
-/etc/asound(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
-/etc/asound\.state	--	gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/etc/alsa/pcm(/.*)?	        gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/etc/asound(/.*)?               gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+ifdef(`distro_debian', `
+/var/lib/alsa/asound\.state     gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/usr/share/alsa/alsa\.conf      gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/usr/share/alsa/pcm(/.*)?       gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+', `
+/etc/alsa/asound\.state --      gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+/etc/asound\.state      --       gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+')
 
 /sbin/alsactl 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 /sbin/salsa 		--	gen_context(system_u:object_r:alsa_exec_t,s0)


-- 
Familiarity breeds contempt -- and children. Mark Twain
Manoj Srivastava <srivasta at acm.org> <http://www.golden-gryphon.com/>  
1024D/BF24424C print 4966 F272 D093 B493 410B  924B 21BA DABB BF24 424C