hal/fdi/90defaultpolicy Makefile.am, 1.1, 1.2 power-mgmt-policy.fdi, NONE, 1.1 storage-policy.fdi, 1.10, 1.11

[David Zeuthen]

Update of /cvs/hal/hal/fdi/90defaultpolicy
In directory gabe:/tmp/cvs-serv28549/fdi/90defaultpolicy

Modified Files:
	Makefile.am storage-policy.fdi 
Added Files:
	power-mgmt-policy.fdi 
Log Message:
2005-02-10  David Zeuthen  <davidz at redhat.com>

	* volume_id/fat.c (volume_id_probe_vfat): Must have been a typo by Kay,
	changed from VOLUME_ID_DISKLABEL to VOLUME_ID_FILESYSTEM.

	* tools/fstab-sync.c (remove_udi): Remember to init the DBusError since
	some operations may fail.
	(main): Look at $HALD_ACTION for add, remove instead of first 
	positional parameter $1.

	* hald/linux2/probing/probe-volume.c: New file

	* hald/linux2/probing/probe-storage.c: New file

	* hald/linux2/probing/linux_dvd_rw_utils.[ch]: New files (imported
	from hal-0.4.x)

	* hald/linux2/probing/Makefile.am: Add rules for hald-probe-storage
	and hald-probe-volume

	* hald/linux2/addons/addon-storage.c: New file

	* hald/linux2/addons/Makefile.am: Add rules for hald-addon-storage

	* hald/linux2/osspec.c (sigio_handler): New function
	(sigio_iochn_data): New function
	(osspec_init): Set up signal handler for SIGIO and the neccesary
	pipes to handle it safely. Set up directory watcher for /etc and
	invoke blockdev_mtab_changed whenever that happens

	* hald/linux2/hotplug.c (hotplug_rescan_device): Call blockdev_*
	if appropriate

	* hald/linux2/blockdev.h: Add some new prototype for interacting
	with hotplug.c (much like what physdev.h and classdev.h)
	exported. Also add the prototype for a new function
	blockdev_mtab_changed.

	* hald/linux2/blockdev.c: Actually put some code here (the previous
	code was just boiler plate).

	* hald/util.h (struct HalHelperData_s): Add boolean already_issued_
	callback

	* hald/util.c (hal_util_get_string_from_file): Truncate whitespace
	from string read
	(hal_util_terminate_helper): Don't remove the child watcher source,
	but set a flag that we already did the callback and helper_child_exited
	will reap the child (including removing sources). This helps reap the
	zombies I've been seeing.
	(helper_child_timeout): -do-
	(helper_child_exited): Only do callback if we haven't already done
	so.

	* hald/debug-hald.sh: Another nice script for running gdb on hald;
	just run this script and invoke the run command from the gdb console.

	* hald/run-hald.sh: Also export ../tools so we can get fstab-sync
	going. Set HAL_FDI_SOURCE

	* hald/device_info.c (di_search_and_merge): Respect the env
	var HAL_FDI_SOURCE which is useful for development as hald will
	read you local .fdi files

	* fdi/90defaultpolicy/storage-policy.fdi: Temporarily add
	fstab-sync add/rem callouts (mental note: move to other file
	soon); also add the media detection addon

	* fdi/90defaultpolicy/power-mgmt-policy.fdi: New file

	* fdi/90defaultpolicy/Makefile.am (fdi90defaultpolicydir): Add
	power-mgmt-policy.fdi



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/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:08 -0000	1.1
+++ Makefile.am	10 Feb 2005 17:03:57 -0000	1.2
@@ -1,4 +1,5 @@
 
 fdi90defaultpolicydir = $(datadir)/hal/fdi/90defaultpolicy
 
-dist_fdi90defaultpolicy_DATA = storage-policy.fdi
+dist_fdi90defaultpolicy_DATA = storage-policy.fdi power-mgmt-policy.fdi
+

--- NEW FILE: power-mgmt-policy.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">

  <device>
    <match key="hiddev.application_pages" contains="Power Device Page">
      <append key="info.addons" type="strlist">hald-addon-hid-ups</append>
    </match>
  </device>

  <device>
    <match key="power_management.type" string="acpi">
      <append key="info.addons" type="strlist">hald-addon-acpi</append>
    </match>
  </device>

</deviceinfo>

Index: storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- storage-policy.fdi	14 Dec 2004 02:57:48 -0000	1.10
+++ storage-policy.fdi	10 Feb 2005 17:03:57 -0000	1.11
@@ -218,4 +218,23 @@
     </match>
   </device>
 
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+      <append key="info.callouts.add" type="strlist">fstab-sync --clean</append>
+    </match>
+
+    <match key="volume.policy.should_mount" bool="true">
+      <append key="info.callouts.add" type="strlist">fstab-sync</append>
+      <append key="info.callouts.remove" type="strlist">fstab-sync</append>
+    </match>
+    <match key="storage.policy.should_mount" bool="true">
+      <append key="info.callouts.add" type="strlist">fstab-sync</append>
+      <append key="info.callouts.remove" type="strlist">fstab-sync</append>
+    </match>
+
+    <match key="storage.media_check_enabled" bool="true">
+      <append key="info.addons" type="strlist">hald-addon-storage</append>
+    </match>
+  </device>
+
 </deviceinfo>