hal/doc/spec hal-spec.html,1.47,1.48
David Zeuthen
david at freedesktop.org
Thu Feb 24 09:33:05 PST 2005
Update of /cvs/hal/hal/doc/spec
In directory gabe:/tmp/cvs-serv9237/doc/spec
Modified Files:
hal-spec.html
Log Message:
2005-02-24 David Zeuthen <davidz at redhat.com>
Fix a few things to get 'make distcheck' to succeed.
Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- hal-spec.html 24 Feb 2005 16:50:34 -0000 1.47
+++ hal-spec.html 24 Feb 2005 17:33:03 -0000 1.48
@@ -7696,7 +7696,23 @@
><TD
><PRE
CLASS="programlisting"
->
+> <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+ <match key="info.bus" string="usb">
+ <match key="usb.vendor_id" int="0x066f">
+ <match key="usb.product_id" int="0x8000">
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <merge key="info.capabilities" type="string">portable_audio_player</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.output_formats" type="string">audio/mpeg audio/x-ms-wma</merge>
+ <merge key="portable_audio_player.input_formats" type="string">audio/x-wav</merge>
+ </match>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
</PRE
></TD
></TR
@@ -7733,7 +7749,21 @@
><TD
><PRE
CLASS="programlisting"
->
+> <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+ <match key="info.bus" string="usb">
+ <match key="usb.vendor_id" int="0x054c">
+ <match key="usb.product_id" int="0x0010">
+ <merge key="info.category" type="string">camera</merge>
+ <merge key="info.capabilities" type="string">camera</merge>
+ <merge key="camera.access_method" type="string">storage</merge>
+ </match>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
</PRE
></TD
></TR
@@ -7770,7 +7800,30 @@
><TD
><PRE
CLASS="programlisting"
->
+> <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+ <match key="storage.bus" string="usb">
+ <match key="@storage.physical_device:usb.vendor_id" int="0x0424">
+ <match key="@storage.physical_device:usb.product_id" int="0x20fc">
+ <match key="storage.lun" int="0">
+ <merge key="storage.drive_type" type="string">compact_flash</merge>
+ </match>
+ <match key="storage.lun" int="1">
+ <merge key="storage.drive_type" type="string">memory_stick</merge>
+ </match>
+ <match key="storage.lun" int="2">
+ <merge key="storage.drive_type" type="string">smart_media</merge>
+ </match>
+ <match key="storage.lun" int="3">
+ <merge key="storage.drive_type" type="string">sd_mmc</merge>
+ </match>
+ </match>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
</PRE
></TD
></TR
@@ -7870,7 +7923,248 @@
><TD
><PRE
CLASS="programlisting"
->
+> <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+
+ <!-- Default policies merged onto computer root object -->
+ <device>
+ <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+ <merge key="storage.policy.default.mount_root" type="string">/media</merge>
+ <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
+ <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
+ <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
+ <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
+ <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
+ <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
+ </match>
+ </device>
+
+ <device>
+ <!-- Whitelist bus types of storage devices we care about -->
+ <match key="info.category" string="storage">
+ <match key="storage.bus" string="usb">
+ <merge key="storage.policy.should_mount" type="bool">true</merge>
+ </match>
+ <match key="storage.bus" string="ide">
+ <merge key="storage.policy.should_mount" type="bool">true</merge>
+ </match>
+ <match key="storage.bus" string="ieee1394">
+ <merge key="storage.policy.should_mount" type="bool">true</merge>
+ </match>
+ <match key="storage.bus" string="sata">
+ <merge key="storage.policy.should_mount" type="bool">true</merge>
+ </match>
+ <match key="storage.bus" string="platform">
+ <merge key="storage.policy.should_mount" type="bool">true</merge>
+ </match>
+ </match>
+ <!-- Also add SCSI optical drives -->
+ <match key="storage.bus" string="scsi">
+ <match key="storage.drive_type" string="cdrom">
+ <merge key="storage.policy.should_mount" type="bool">true</merge>
+ </match>
+ </match>
+
+ <!-- Handle drives with non-partitioned media -->
+ <match key="storage.no_partitions_hint" bool="true">
+ <!-- optical drives -->
+ <match key="storage.drive_type" string="cdrom">
+ <merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+ <merge key="storage.policy.desired_mount_point" type="string">cdrom</merge>
+ <match key="storage.cdrom.cdr" bool="true">
+ <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+ </match>
+ <match key="storage.cdrom.cdrw" bool="true">
+ <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+ </match>
+ <match key="storage.cdrom.dvdplusr" bool="true">
+ <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+ </match>
+ <match key="storage.cdrom.dvdplusrw" bool="true">
+ <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+ </match>
+ <match key="storage.cdrom.dvdram" bool="true">
+ <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+ </match>
+ <match key="storage.cdrom.dvdr" bool="true">
+ <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+ </match>
+ <match key="storage.cdrom.dvdrw" bool="true">
+ <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+ <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ </match>
+
+ <!-- floppy drives -->
+ <match key="storage.drive_type" string="floppy">
+ <merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+ <merge key="storage.policy.desired_mount_point" type="string">floppy</merge>
+ <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+ <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ </match>
+
+ <!-- zip drives -->
+ <match key="storage.drive_type" string="zip">
+ <merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+ <merge key="storage.policy.desired_mount_point" type="string">zip</merge>
+ <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+ <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ </match>
+
+ <!-- jaz drives -->
+ <match key="storage.drive_type" string="jaz">
+ <merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+ <merge key="storage.policy.desired_mount_point" type="string">jaz</merge>
+ <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+ <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+
+ <!-- Normal volumes; use volume label, uuid or drive_type -->
+ <match key="block.is_volume" bool="true">
+ <match key="volume.fsusage" string="filesystem">
+ <!-- skip for drives with the no partitions hint (they are handled above) -->
+ <match key="@block.storage_device:storage.no_partitions_hint" bool="false">
+
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ <merge key="volume.policy.mount_filesystem" type="copy_property">volume.fstype</merge>
+
+ <!-- Fallback is '<storage.bus>', appended with 'disk', e.g. usbdisk,
+ idedisk, scsidisk etc. -->
+ <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
+ <append key="volume.policy.desired_mount_point" type="string">disk</append>
+
+ <!-- zip drives -->
+ <match key="storage.drive_type" string="zip">
+ <merge key="storage.policy.desired_mount_point" type="string">zip</merge>
+ </match>
+
+ <!-- Best: If available use filesystem label -->
+ <match key="volume.label" empty="false">
+ <!-- unless it's a path (e.g. /boot, /, /home etc) -->
+ <match key="volume.label" is_absolute_path="false">
+ <!-- and only if the label is ascii -->
+ <match key="volume.label" is_ascii="true">
+ <merge key="volume.policy.desired_mount_point" type="copy_property">volume.label</merge>
+ </match>
+ </match>
+ </match>
+
+ <!-- Should never mount Apple Bootstrap partitions (it would be
+ a security hole) - should use the bootable flag from the
+ Mac partition table instead -->
+ <match key="volume.fstype" string="hfs">
+ <match key="volume.label" string="bootstrap">
+ <merge key="volume.policy.should_mount" type="bool">false</merge>
+ </match>
+ </match>
+
+ <!-- Use selinux mount options for hotpluggable and removable
+ volumes -->
+ <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
+ <match key="@block.storage_device:storage.hotpluggable" bool="true">
+ <merge key="volume.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ <match key="@block.storage_device:storage.removable" bool="true">
+ <merge key="volume.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
+ </match>
+ </match>
+
+ <!-- Use noatime and sync options for all hotpluggable or removable
+ volumes smaller than 2GB -->
+ <match key="volume.size" compare_lt="2147483648">
+ <match key="@block.storage_device:storage.hotpluggable" bool="true">
+ <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
+ <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
+ </match>
+ <match key="@block.storage_device:storage.removable" bool="true">
+ <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
+ <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
+ </match>
+ </match>
+
+ <!-- whitelist of partition table id's, if from a msdos partition table -->
+ <match key="volume.partition.msdos_part_table_type" exists="true">
+ <!-- Default to no mount and punch holes -->
+ <merge key="volume.policy.should_mount" type="bool">false</merge>
+ <!-- Linux -->
+ <match key="volume.partition.msdos_part_table_type" int="0x83">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ <!-- FAT12 -->
+ <match key="volume.partition.msdos_part_table_type" int="0x01">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ <!-- FAT16 <32M -->
+ <match key="volume.partition.msdos_part_table_type" int="0x04">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ <!-- FAT16 -->
+ <match key="volume.partition.msdos_part_table_type" int="0x06">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ <!-- HPFS/NTFS -->
+ <match key="volume.partition.msdos_part_table_type" int="0x07">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ <!-- W95 FAT32 -->
+ <match key="volume.partition.msdos_part_table_type" int="0x0b">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ <!-- W95 FAT32 (LBA) -->
+ <match key="volume.partition.msdos_part_table_type" int="0x0c">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ <!-- W95 FAT16 (LBA) -->
+ <match key="volume.partition.msdos_part_table_type" int="0x0e">
+ <merge key="volume.policy.should_mount" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+
+ </device>
+
+ <!-- Dont want to mount non-hotpluggable fixed disks since ideraid
+ detection isnt complete as hald wrongly detects e.g. partitions
+ from some IDE RAID controllers -->
+ <device>
+ <match key="storage.hotpluggable" bool="false">
+ <match key="storage.removable" bool="false">
+ <merge key="storage.policy.should_mount" type="bool">false</merge>
+ </match>
+ </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>
</PRE
></TD
></TR
More information about the hal-commit
mailing list