hal/doc/spec hal-spec.html,1.33,1.34

[David Zeuthen]

Update of /cvs/hal/hal/doc/spec
In directory gabe:/tmp/cvs-serv26755/doc/spec

Modified Files:
	hal-spec.html 
Log Message:
2004-10-18  David Zeuthen  <davidz at redhat.com>

	* hald/hald.c (main): Do openlog() so we can log to the syslog
	
	* hald/linux/hald_helper.h: Add a timestamp field
	
	* hald/linux/osspec.c:
	(osspec_timer_handler): Call hotplug_timeout_handler
	(hotplug_timeout_handler): New function
	(hald_helper_hotplug_process_queue): Set last timestamp and add
	 uncommented test code for dropping every 16th hotplug event
	(hald_helper_first_hotplug_event): Update last timestamp
	
	* tools/linux/hal_dev.c (main): Set timestamp
	
	* tools/linux/hal_hotplug.c (main): Set timestamp



Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- hal-spec.html	14 Oct 2004 23:06:35 -0000	1.33
+++ hal-spec.html	18 Oct 2004 22:52:05 -0000	1.34
@@ -6923,13 +6923,10 @@
 	  &#60;merge key="volume.policy.should_mount" type="bool"&#62;true&#60;/merge&#62;
 	  &#60;merge key="volume.policy.mount_filesystem" type="copy_property"&#62;volume.fstype&#60;/merge&#62;
 	  
-	  &#60;!-- Fallback is '&#60;storage.drive_type&#62;', e.g. disk, compact_flash etc. --&#62;
-	  &#60;merge key="volume.policy.desired_mount_point" type="copy_property"&#62;@block.storage_device:storage.drive_type&#60;/merge&#62;
-	  
-	  &#60;!-- Better: if available use UUID --&#62;
-          &#60;match key="volume.uuid" empty="false"&#62;
-            &#60;merge key="volume.policy.desired_mount_point" type="copy_property"&#62;volume.uuid&#60;/merge&#62;
-          &#60;/match&#62;
+	  &#60;!-- Fallback is '&#60;storage.bus&#62;', appended with 'disk', e.g. usbdisk,
+	       idedisk, scsidisk etc. --&#62;
+	  &#60;merge key="volume.policy.desired_mount_point" type="copy_property"&#62;@block.storage_device:storage.bus&#60;/merge&#62;
+	  &#60;append key="volume.policy.desired_mount_point" type="string"&#62;disk&#60;/append&#62;
 	  
           &#60;!-- Best: If available use filesystem label --&#62;
           &#60;match key="volume.label" empty="false"&#62;