hal: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Thu Jul 27 18:56:16 PDT 2006
fdi/10generic/.gitignore | 3
fdi/10generic/Makefile.am | 4
fdi/20freedesktop/.gitignore | 3
fdi/20freedesktop/6in1-card-reader.fdi | 24 --
fdi/20freedesktop/Makefile.am | 20 --
fdi/20freedesktop/ide-drives.fdi | 84 ---------
fdi/20freedesktop/jetflash-mp3-player.fdi | 17 -
fdi/20freedesktop/lexar-media-cf-reader.fdi | 13 -
fdi/20freedesktop/lucent-pcmcia-wireless.fdi | 16 -
fdi/20freedesktop/sony_dsc.fdi | 15 -
fdi/20freedesktop/usb-pda-devices.fdi | 17 -
fdi/20freedesktop/usb-pda-serial.fdi | 13 -
fdi/20freedesktop/usb-zip-drives.fdi | 19 --
fdi/30osvendor/Makefile.am | 4
fdi/40oem/Makefile.am | 4
fdi/50user/Makefile.am | 4
fdi/90defaultpolicy/Makefile.am | 9 -
fdi/90defaultpolicy/power-mgmt-policy.fdi | 17 -
fdi/90defaultpolicy/storage-policy.fdi | 242 ---------------------------
fdi/95userpolicy/Makefile.am | 4
20 files changed, 532 deletions(-)
New commits:
diff-tree 9ddbbe5b9408371a9abefed2e026444b0683e0ef (from 24657075b84286d4f4d81f872b117c7679c919a4)
Author: David Zeuthen <davidz at redhat.com>
Date: Thu Jul 27 21:56:14 2006 -0400
Remove unused .fdi files.
diff --git a/fdi/10generic/.gitignore b/fdi/10generic/.gitignore
deleted file mode 100644
index 8f1b0d9..0000000
--- a/fdi/10generic/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.o
diff --git a/fdi/10generic/Makefile.am b/fdi/10generic/Makefile.am
deleted file mode 100644
index 36702db..0000000
--- a/fdi/10generic/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-fdi10genericdir = $(datadir)/hal/fdi/10generic
-
-dist_fdi10generic_DATA =
diff --git a/fdi/20freedesktop/.gitignore b/fdi/20freedesktop/.gitignore
deleted file mode 100644
index 8f1b0d9..0000000
--- a/fdi/20freedesktop/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.o
diff --git a/fdi/20freedesktop/6in1-card-reader.fdi b/fdi/20freedesktop/6in1-card-reader.fdi
deleted file mode 100644
index 61b2a5d..0000000
--- a/fdi/20freedesktop/6in1-card-reader.fdi
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>
diff --git a/fdi/20freedesktop/Makefile.am b/fdi/20freedesktop/Makefile.am
deleted file mode 100644
index d5caecf..0000000
--- a/fdi/20freedesktop/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-fdi20freedesktopdir = $(datadir)/hal/fdi/20freedesktop
-
-dist_fdi20freedesktop_DATA = \
- sony_dsc.fdi \
- 6in1-card-reader.fdi \
- lexar-media-cf-reader.fdi \
- lucent-pcmcia-wireless.fdi \
- jetflash-mp3-player.fdi \
- ide-drives.fdi \
- usb-zip-drives.fdi \
- usb-pda-devices.fdi \
- usb-pda-serial.fdi
-
-check:
- xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(dist_fdi_DATA)
-
-
-
diff --git a/fdi/20freedesktop/ide-drives.fdi b/fdi/20freedesktop/ide-drives.fdi
deleted file mode 100644
index a55f08d..0000000
--- a/fdi/20freedesktop/ide-drives.fdi
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-
- <device>
-
- <!-- Handle weird Dell Laptops that slow down the system if the optical
- drive is polled (RH Bug #138148) -->
- <match key="storage.bus" string="ide">
- <match key="storage.model" string="HL-DT-STCD-RW/DVD-ROM GCC-4240N">
- <match key="block.device" string="/dev/hdb">
- <merge key="storage.media_check_enabled" type="bool">false</merge>
- </match>
- <match key="block.device" string="/dev/hdd">
- <merge key="storage.media_check_enabled" type="bool">false</merge>
- </match>
- </match>
- </match>
-
- <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
- <match key="storage.bus" string="ide">
- <match key="storage.drive_type" string="disk">
- <!-- IOMEGA Zip Drive -->
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
- </match>
- </match>
-
- <match key="storage.bus" string="ide">
- <match key="storage.drive_type" string="floppy">
- <!-- IOMEGA Zip Drive -->
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
- </match>
- </match>
-
- </device>
-</deviceinfo>
diff --git a/fdi/20freedesktop/jetflash-mp3-player.fdi b/fdi/20freedesktop/jetflash-mp3-player.fdi
deleted file mode 100644
index b821df3..0000000
--- a/fdi/20freedesktop/jetflash-mp3-player.fdi
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
diff --git a/fdi/20freedesktop/lexar-media-cf-reader.fdi b/fdi/20freedesktop/lexar-media-cf-reader.fdi
deleted file mode 100644
index 1e39118..0000000
--- a/fdi/20freedesktop/lexar-media-cf-reader.fdi
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="0x05dc">
- <match key="@storage.physical_device:usb.product_id" int="0x0002">
- <merge key="storage.drive_type" type="string">compact_flash</merge>
- </match>
- </match>
- </match>
- </device>
-</deviceinfo>
diff --git a/fdi/20freedesktop/lucent-pcmcia-wireless.fdi b/fdi/20freedesktop/lucent-pcmcia-wireless.fdi
deleted file mode 100644
index c46aa18..0000000
--- a/fdi/20freedesktop/lucent-pcmcia-wireless.fdi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
- <device>
- <match key="info.bus" string="unknown">
- <!-- FIXME: We need to be able to match capabilities -->
- <match key="info.capabilities" string="net net.ethernet net.ethernet.80211">
- <match key="net.ethernet.mac_addr_upper24" int="0x601d">
- <merge key="info.bus" type="string">pcmcia</merge>
- <merge key="info.vendor" type="string">Lucent Technologies"</merge>
- <merge key="info.product" type="string">WaveLAN/IEEE</merge>
- </match>
- </match>
- </match>
- </device>
-</deviceinfo>
diff --git a/fdi/20freedesktop/sony_dsc.fdi b/fdi/20freedesktop/sony_dsc.fdi
deleted file mode 100644
index cb91b45..0000000
--- a/fdi/20freedesktop/sony_dsc.fdi
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
diff --git a/fdi/20freedesktop/usb-pda-devices.fdi b/fdi/20freedesktop/usb-pda-devices.fdi
deleted file mode 100644
index dffb047..0000000
--- a/fdi/20freedesktop/usb-pda-devices.fdi
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
- <!-- Palm Tungsten T -->
- <device>
- <match key="info.bus" string="usb">
- <match key="usb.vendor_id" int="0x0830">
- <match key="usb.product_id" int="0x0060">
- <merge key="info.category" type="string">pda</merge>
- <merge key="info.capabilities" type="string">pda</merge>
- <merge key="pda.serial.use_net" type="bool">true</merge>
- <merge key="pda.access_method" type="string">serial</merge>
- </match>
- </match>
- </match>
- </device>
-</deviceinfo>
diff --git a/fdi/20freedesktop/usb-pda-serial.fdi b/fdi/20freedesktop/usb-pda-serial.fdi
deleted file mode 100644
index 3c8a414..0000000
--- a/fdi/20freedesktop/usb-pda-serial.fdi
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
- <device>
- <match key="info.bus" string="usb-serial">
- <match key="@info.parent:pda.access_method" string="serial">
- <merge key="info.category" type="string">pda_endpoint_serial</merge>
- <merge key="info.capabilities" type="string">pda_endpoint_serial</merge>
- <merge key="pda_endpoint_serial.pda_device" type="copy_property">info.parent</merge>
- </match>
- </match>
- </device>
-</deviceinfo>
diff --git a/fdi/20freedesktop/usb-zip-drives.fdi b/fdi/20freedesktop/usb-zip-drives.fdi
deleted file mode 100644
index cf88d72..0000000
--- a/fdi/20freedesktop/usb-zip-drives.fdi
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
- <device>
-
- <!-- USB Zip Drives -->
- <match key="storage.bus" string="usb">
- <match key="storage.drive_type" string="disk">
- <match key="storage.vendor" string="IOMEGA">
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
- </match>
- </match>
- </match>
-
- </device>
-</deviceinfo>
diff --git a/fdi/30osvendor/Makefile.am b/fdi/30osvendor/Makefile.am
deleted file mode 100644
index bad600a..0000000
--- a/fdi/30osvendor/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-fdi30osvendordir = $(datadir)/hal/fdi/30osvendor
-
-dist_fdi30osvendor_DATA =
diff --git a/fdi/40oem/Makefile.am b/fdi/40oem/Makefile.am
deleted file mode 100644
index edf63ca..0000000
--- a/fdi/40oem/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-fdi40oemdir = $(datadir)/hal/fdi/40oem
-
-dist_fdi40oem_DATA =
diff --git a/fdi/50user/Makefile.am b/fdi/50user/Makefile.am
deleted file mode 100644
index 4666cf1..0000000
--- a/fdi/50user/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-fdi50userdir = $(datadir)/hal/fdi/50user
-
-dist_fdi50user_DATA =
diff --git a/fdi/90defaultpolicy/Makefile.am b/fdi/90defaultpolicy/Makefile.am
deleted file mode 100644
index 298a679..0000000
--- a/fdi/90defaultpolicy/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-fdi90defaultpolicydir = $(datadir)/hal/fdi/90defaultpolicy
-
-dist_fdi90defaultpolicy_DATA = storage-policy.fdi power-mgmt-policy.fdi
-
-check:
- xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(dist_fdi90defaultpolicy_DATA)
-
-
diff --git a/fdi/90defaultpolicy/power-mgmt-policy.fdi b/fdi/90defaultpolicy/power-mgmt-policy.fdi
deleted file mode 100644
index fba938c..0000000
--- a/fdi/90defaultpolicy/power-mgmt-policy.fdi
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
diff --git a/fdi/90defaultpolicy/storage-policy.fdi b/fdi/90defaultpolicy/storage-policy.fdi
deleted file mode 100644
index 41ced0f..0000000
--- a/fdi/90defaultpolicy/storage-policy.fdi
+++ /dev/null
@@ -1,242 +0,0 @@
-<?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>
diff --git a/fdi/95userpolicy/Makefile.am b/fdi/95userpolicy/Makefile.am
deleted file mode 100644
index bdd1d34..0000000
--- a/fdi/95userpolicy/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-fdi95userpolicydir = $(datadir)/hal/fdi/95userpolicy
-
-dist_fdi95userpolicy_DATA =
More information about the hal-commit
mailing list