hal/fdi/20freedesktop ide-drives.fdi, 1.2, 1.3 usb-zip-drives.fdi,
1.2, 1.3
David Zeuthen
david at freedesktop.org
Tue Jan 18 11:48:14 PST 2005
Update of /cvs/hal/hal/fdi/20freedesktop
In directory gabe:/tmp/cvs-serv19239/fdi/20freedesktop
Modified Files:
ide-drives.fdi usb-zip-drives.fdi
Log Message:
2005-01-18 David Zeuthen <david at fubar.dk>
* tools/linux/Makefile.am: Remove hal.dev build rules
* tools/linux/hal_dev.c: Remove
* configure.in: Set linux2 as the default backend
* hald/linux: Remove all files here as they will get reimplemented
in hald/linux2
* hald/linux2: Add a bunch of new files
* hald/linux2/probing: Add some new files
2005-01-18 David Zeuthen <davidz at redhat.com>
Merge some more changes from the stable branch (except those
in hald/linux and doc/spec)
2005-01-12 David Zeuthen <davidz at redhat.com>
* hald/callout.c (callout_timeout_handler): Be tough and kill
the misbehaving child the hard way - suggestion from Joe Shaw.
2005-01-12 David Zeuthen <davidz at redhat.com>
* hald/linux/osspec.c (HOTPLUG_TIMEOUT): Increase to 25 seconds
to better cope with callouts timeout of 10 seconds
* hald/callout.c (iochn_data): Cope with callouts terminating
and free timeout handler
(callout_timeout_handler): New function; kill callouts if they
time out
(process_next_callout): Setup timeout for callouts - set to
ten seconds
2005-01-11 David Zeuthen <davidz at redhat.com>
* hald/callout.c: Simplify a lot more by demanding that callouts
are run sequentially - which they are anyway since everything is
serialized. Make a mental note to review and stress test this in
the morning.
2005-01-11 David Zeuthen <davidz at redhat.com>
* hald/callout.c: Fix some craziness adding an idle handler for
detecting when callouts complete - fixes bug on my new AMD64
system with device add/remove prior to completion of callouts -
one visible effect was that fstab-sync was crashing since it
couldn't retrieve the block.device device as the device was
removed prior to the completion of the callout
2005-01-07 David Zeuthen <davidz at redhat.com>
* fdi/20freedesktop/ide-drives.fdi: Also check IDE floppies for whether
they are Zip drives
2005-01-07 Joe Shaw <joeshaw at novell.com>
* configure.in: Check for popt when building fstab-sync and error
out if it's not found.
* tools/Makefile.am: Build fstab-sync conditionally based on
whether --enable-fstab-sync is passed in.
2005-01-06 David Zeuthen <davidz at redhat.com>
* libhal/libhal.c (hal_device_query_capability): Patch from Tim
Müller <t.i.m at zen.co.uk>. The attached patch fixes a small memory
leak in libhal's hal_device_query_capability().
2005-01-03 David Zeuthen <davidz at redhat.com>
* configure.in: Added it to ALL_LINGUAS
* po/it.po: Italien translation from Pier Luigi Fiorini
<pierluigi.fiorini at mockup.org>
2004-12-15 David Zeuthen <davidz at redhat.com>
* fdi/20freedesktop/usb-zip-drives.fdi: Only match on actual
harddisks to avoid wrong detection of e.g. "Iomega ZipCD 650 USB CDRW"
drives (Red Hat bug #143834)
* fdi/20freedesktop/ide-drives.fdi: ditto
Index: ide-drives.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/ide-drives.fdi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ide-drives.fdi 14 Dec 2004 02:57:48 -0000 1.2
+++ ide-drives.fdi 18 Jan 2005 19:48:12 -0000 1.3
@@ -19,33 +19,66 @@
<!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
<match key="storage.bus" string="ide">
- <!-- 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 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>
- <!-- 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 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>
+
+ </device>
</deviceinfo>
Index: usb-zip-drives.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/usb-zip-drives.fdi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- usb-zip-drives.fdi 14 Dec 2004 02:57:48 -0000 1.2
+++ usb-zip-drives.fdi 18 Jan 2005 19:48:12 -0000 1.3
@@ -5,11 +5,13 @@
<!-- USB Zip Drives -->
<match key="storage.bus" string="usb">
- <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 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>
More information about the hal-commit
mailing list