hal/doc/conf Makefile.am, 1.1, 1.2 storage-non-fixed.fdi, NONE, 1.1 storage-skip-all.fdi, NONE, 1.1

[David Zeuthen]

Update of /cvs/hal/hal/doc/conf
In directory gabe:/tmp/cvs-serv19112/doc/conf

Modified Files:
	Makefile.am 
Added Files:
	storage-non-fixed.fdi storage-skip-all.fdi 
Log Message:
2004-10-14  David Zeuthen  <davidz at redhat.com>

	* configure.in: Add fstab-sync.8 to AC_OUTPUT
	
	* doc/conf/storage-non-fixed.fdi: New file, example

	* doc/conf/storage-skip-all.fdi: New file, example

	* doc/conf/Makefile.am: Dist and install two new .fdi files

	* fdi/90defaultpolicy/storage-policy.fdi: Fix a typo in a comment

	* hald/device_info.c:
	(my_alphasort): New function 
	(scan_fdi_files): Use my_alphasort to sort in the right order. Process
	all .fdi files instead of bailing out on the first match.

	* hald/linux/osspec.c:
	(get_selinux_removable_context): New function, copied over from 
	tools/fstab-sync.c (not currently used)
	(osspec_probe): Use get_selinux_removable_context (not currently used)

	* libhal-storage/libhal-storage.c:
	(hal_drive_policy_get_mount_options): Check if mount_option property
	is actually FALSE.
	(hal_volume_policy_get_mount_options): Same

	* libhal/libhal.c:
	(hal_free_property_set): Check if object to free is NULL and just
	return. Allows hal_free_property_set (NULL).

	* tools/Makefile.am: Add rules for building fstab-sync.8 man page

	* tools/fstab-sync.8.in: New file

	* tools/fstab-sync.c: Much rewritten to use libhal-storage and the new
	policy properties. See diff for details.



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/conf/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	12 Oct 2004 20:17:07 -0000	1.1
+++ Makefile.am	14 Oct 2004 18:37:28 -0000	1.2
@@ -1,2 +1,5 @@
 
-EXTRA_DIST = storage-policy-examples.fdi
+EXTRA_DIST = storage-policy-examples.fdi storage-skip-all.fdi storage-non-fixed.fdi
+
+confdir = $(datadir)/doc/hal-$(VERSION)/conf
+conf_DATA = storage-policy-examples.fdi storage-skip-all.fdi storage-non-fixed.fdi

--- NEW FILE: storage-non-fixed.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<!-- This .fdi files makes sure no fixed storage device gets tagged as
     mountable except if it's a floppy or optical drive -->
<deviceinfo version="0.2">
  <device>
    <match key="storage.hotpluggable" bool="false">
	<merge key="storage.policy.should_mount" type="bool">false</merge>
	<match key="storage.drive_type" string="floppy">
	  <merge key="storage.policy.should_mount" type="bool">true</merge>
	</match>
	<match key="storage.drive_type" string="cdrom">
	  <merge key="storage.policy.should_mount" type="bool">true</merge>
	</match>
    </match>
  </device>
</deviceinfo>

--- NEW FILE: storage-skip-all.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<!-- This .fdi files will tag all storage devices as non mountable -->
<deviceinfo version="0.2">
  <device>
    <match key="info.category" string="storage">
      <merge key="storage.policy.should_mount" type="bool">false</merge>
    </match>
  </device>
</deviceinfo>