hal/doc/spec hal-spec.html,1.45,1.46

[David Zeuthen]

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

Modified Files:
	hal-spec.html 
Log Message:
2005-02-11  David Zeuthen  <davidz at redhat.com>

	* Makefile.am (SUBDIRS): Rearrange order so volume_id and drive_id
	is built before anything else.



Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- hal-spec.html	10 Feb 2005 17:45:11 -0000	1.45
+++ hal-spec.html	11 Feb 2005 22:09:22 -0000	1.46
@@ -7804,13 +7804,21 @@
 
 &#60;deviceinfo version="0.2"&#62;
   &#60;device&#62;
-    &#60;match key="info.bus" string="usb"&#62;
-      &#60;match key="usb.vendor_id" int="0x0424"&#62;
-        &#60;match key="usb.product_id" int="0x20fc"&#62;
-          &#60;merge key="storage_lun0.drive_type" type="string"&#62;compact_flash&#60;/merge&#62;
-          &#60;merge key="storage_lun1.drive_type" type="string"&#62;memory_stick&#60;/merge&#62;
-          &#60;merge key="storage_lun2.drive_type" type="string"&#62;smart_media&#60;/merge&#62;
-          &#60;merge key="storage_lun3.drive_type" type="string"&#62;sd_mmc&#60;/merge&#62;
+    &#60;match key="storage.bus" string="usb"&#62;
+      &#60;match key="@storage.physical_device:usb.vendor_id" int="0x0424"&#62;
+        &#60;match key="@storage.physical_device:usb.product_id" int="0x20fc"&#62;
+          &#60;match key="storage.lun" int="0"&#62;
+            &#60;merge key="storage.drive_type" type="string"&#62;compact_flash&#60;/merge&#62;
+	  &#60;/match&#62;
+          &#60;match key="storage.lun" int="1"&#62;
+            &#60;merge key="storage.drive_type" type="string"&#62;memory_stick&#60;/merge&#62;
+	  &#60;/match&#62;
+          &#60;match key="storage.lun" int="2"&#62;
+            &#60;merge key="storage.drive_type" type="string"&#62;smart_media&#60;/merge&#62;
+	  &#60;/match&#62;
+          &#60;match key="storage.lun" int="3"&#62;
+            &#60;merge key="storage.drive_type" type="string"&#62;sd_mmc&#60;/merge&#62;
+	  &#60;/match&#62;
         &#60;/match&#62;
       &#60;/match&#62;
     &#60;/match&#62;
@@ -8144,6 +8152,7 @@
       &#60;append key="info.callouts.add" type="strlist"&#62;fstab-sync&#60;/append&#62;
       &#60;append key="info.callouts.remove" type="strlist"&#62;fstab-sync&#60;/append&#62;
     &#60;/match&#62;
+
     &#60;match key="storage.policy.should_mount" bool="true"&#62;
       &#60;append key="info.callouts.add" type="strlist"&#62;fstab-sync&#60;/append&#62;
       &#60;append key="info.callouts.remove" type="strlist"&#62;fstab-sync&#60;/append&#62;
@@ -8152,6 +8161,7 @@
     &#60;match key="storage.media_check_enabled" bool="true"&#62;
       &#60;append key="info.addons" type="strlist"&#62;hald-addon-storage&#60;/append&#62;
     &#60;/match&#62;
+
   &#60;/device&#62;
 
 &#60;/deviceinfo&#62;