hal/fdi/preprobe/10osvendor 10-ide-drives.fdi, NONE, 1.1 Makefile.am, NONE, 1.1

[David Zeuthen]

Update of /cvs/hal/hal/fdi/preprobe/10osvendor
In directory gabe:/tmp/cvs-serv5124/fdi/preprobe/10osvendor

Added Files:
	10-ide-drives.fdi Makefile.am 
Log Message:
2005-02-24  David Zeuthen  <davidz at redhat.com>

	* tools/linux/hal_hotplug_map.c: Removed

	* tools/linux/Makefile.am: Remove build rules for hal-hotplug-map

	* hald/linux2/physdev.c: Callouts now take two userdata pointers
	(physdev_callouts_preprobing_done): New function
	(hotplug_event_begin_add_physdev): Run preprobing callouts
	just before real probing (flow continues in the above function)

	* hald/linux2/osspec.c: Callouts now take two userdata pointers

	* hald/linux2/classdev.c: Callouts now take two userdata pointers
	(classdev_callouts_preprobing_done): New function
	(hotplug_event_begin_add_classdev): Run preprobing callouts
	just before real probing (flow continues in the above function)

	* hald/linux2/blockdev.c: Callouts now take two userdata pointers
	(blockdev_callouts_preprobing_storage_done): New function
	(blockdev_callouts_preprobing_volume_done): New function
	(hotplug_event_begin_add_blockdev): Run preprobing callouts just
	before real probing (flow continues in the two above
	functions)

	* hald/linux2/apm.c: Callouts now take two userdata pointers

	* hald/linux2/acpi.c: Callouts now take two userdata pointers

	* hald/util.h: Fix up prototypes for callouts to take two userdata
	pointers. Add hal_util_callout_device_preprobe prototype.

	* hald/util.c: Change callouts to take two userdata pointers
	(hal_util_callout_device_preprobe): New function

	* hald/hald.c (main): Don't call hald_read_conf_file() as this
	is now gone.

	* hald/device_info.h (di_search_and_merge): Tweak prototype for
	di_search_and_merge to take a DeviceInfoType parameter

	* hald/device_info.c (di_search_and_merge): Lookup new environment
	variables

	* hald/run-hald.sh: Use new environment variables for specifying
	fdi file location

	* hald/debug-hald.sh: Use new environment variables for specifying
	fdi file location

	* hald/Makefile.am: Don't link with libselinux and don't install
	callout directories
	(hald_test_SOURCES): Remove hald_conf.[ch]
	(hald_SOURCES): Remove hald_conf.[ch].

	* configure.in: Add notes about how to tweak the hal tarball for a
	particular distribution or OS. Rework the details a bit. Remove the
	hotplug_map rules. Remove selinux bits (for now). Rework what fdi
	file directory Makefile's to generate.

	* hald/hald.conf: Removed

	* hald/hald_conf.[ch]: Removed

	* fdi/Makefile.am (SUBDIRS): Specificy new subdirs

	* fdi/preprobe: New

	* fdi/preprobe/Makefile.am: New

	* fdi/preprobe/10osvendor: New

	* fdi/preprobe/10osvendor/10-ide-drives.fdi: New

	* fdi/preprobe/10osvendor/Makefile.am: New

	* fdi/preprobe/20thirdparty: New

	* fdi/preprobe/20thirdparty/Makefile.am: New

	* fdi/preprobe/30user: New

	* fdi/preprobe/30user/Makefile.am: New

	* fdi/information: New

	* fdi/information/Makefile.am: New

	* fdi/information/10freedesktop: New

	* fdi/information/10freedesktop/Makefile.am: New

	* fdi/information/20thirdparty: New

	* fdi/information/20thirdparty/Makefile.am: New

	* fdi/information/30user: New

	* fdi/information/30user/Makefile.am: New

	* fdi/policy: New

	* fdi/policy/Makefile.am: New

	* fdi/policy/10osvendor: New

	* fdi/policy/10osvendor/10-storage-policy.fdi: New

	* fdi/policy/10osvendor/10-power-mgmt-policy.fdi: New

	* fdi/policy/10osvendor/90-fstab-sync.fdi: New

	* fdi/policy/10osvendor/Makefile.am: New

	* fdi/policy/20thirdparty: New

	* fdi/policy/20thirdparty/Makefile.am: New

	* fdi/policy/30user: New

	* fdi/policy/30user/Makefile.am: New

	* fdi/README: New file to describe the new directory structure



--- NEW FILE: 10-ide-drives.fdi ---
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- 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>

--- NEW FILE: Makefile.am ---

fdidir = $(sysconfdir)/hal/preprobe/10osvendor

dist_fdi_DATA =