hal/fdi/policy/10osvendor 20-storage-add-selinux.fdi, NONE, 1.1 Makefile.am, 1.2, 1.3

[David Zeuthen]

Update of /cvs/hal/hal/fdi/policy/10osvendor
In directory gabe:/tmp/cvs-serv25656/fdi/policy/10osvendor

Modified Files:
	Makefile.am 
Added Files:
	20-storage-add-selinux.fdi 
Log Message:
2005-02-24  David Zeuthen  <davidz at redhat.com>

	* configure.in: Add back selinux detection; default to auto

	* tools/linux/add_selinux.c: New file, add selinux attributes the
	Right Way(tm) instead of hardcoding the context (RH bug 135765)

	* tools/linux/Makefile.am: If HAVE_SELINUX is set, add build rules
	for hald-add-selinux-mount-option

	* fdi/policy/10osvendor/20-storage-add-selinux.fdi: New file, invoke
	hald-add-selinux-mount-option (only used if HAVE_SELINUX is 1)

	* tools/linux/hal_hotplug_map.c: Removed (forgot to remove it earlier)



--- NEW FILE: 20-storage-add-selinux.fdi ---
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">

  <device>
    <match key="volume.policy.should_mount" bool="true">
      <match key="@block.storage_device:storage.policy.should_mount" bool="true">
	<prepend key="info.callouts.add" type="strlist">hald-add-selinux-mount-option</prepend>
      </match>
    </match>

    <match key="storage.policy.should_mount" bool="true">
      <match key="storage.no_partitions_hint" bool="true">
	<prepend key="info.callouts.add" type="strlist">hald-add-selinux-mount-option</prepend>
      </match>
    </match>
  </device>

</deviceinfo>


Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	24 Feb 2005 19:51:04 -0000	1.2
+++ Makefile.am	25 Feb 2005 04:52:23 -0000	1.3
@@ -3,6 +3,10 @@
 
 dist_fdi_DATA = 10-storage-policy.fdi 10-power-mgmt-policy.fdi
 
+if HAVE_SELINUX
+dist_fdi_DATA += 20-storage-add-selinux.fdi
+endif
+
 if FSTAB_SYNC_ENABLED
 dist_fdi_DATA += 90-fstab-sync.fdi
 endif