[Pkg-utopia-commits] r1243 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2007-02-18 12:43:48 +0100 (Sun, 18 Feb 2007)
New Revision: 1243

Added:
   packages/unstable/hal/debian/hal.examples
   packages/unstable/hal/debian/no-cd-media-check.fdi
   packages/unstable/hal/debian/patches/29_handle_non_hal_mounts.patch
Modified:
   packages/unstable/hal/debian/README.Debian
   packages/unstable/hal/debian/changelog
Log:
* Acknowledge Steve Langasek's NMU. (Closes: #370186) 
* debian/patches/29_handle_non_hal_mounts.patch
  - Added. Handle volume removal for mounted volumed that weren't mounted by
    hal correctly.
* Non-maintainer upload.
* High-urgency upload for RC bugfix.
* Provide /usr/share/doc/hal/examples/no-cd-media-check.fdi as an example
  for disabling CD ROM media checks, and document this in README.Debian, as
  a workaround for CD drives with broken firmware.  Closes: #370186.

Modified: packages/unstable/hal/debian/README.Debian
===================================================================
--- packages/unstable/hal/debian/README.Debian	2007-02-13 18:24:10 UTC (rev 1242)
+++ packages/unstable/hal/debian/README.Debian	2007-02-18 11:43:48 UTC (rev 1243)
@@ -10,4 +10,16 @@
  restarted to enable monitoring of acpi events again. And if apci is installed,
  hal needs a restart to free the kernels acpi events interface for acpid.
 
- -- Sjoerd Simons <sjoerd at debian.org>
+
+ Some CD and DVD drives, such as the GDR8162B model found in some Dell 
+ laptops, do not correctly handle media status inquiries and incorrectly
+ spin up the drive when they should not.  Since hal regularly polls CD
+ drives for media changes, this results in increased power consumption and
+ mechanical wear and tear on such drives, which remain spinning constantly
+ while hal is running.
+
+ If you have a CD/DVD drive exhibiting this problem, you can copy
+ /usr/share/doc/hal/examples/no-cd-media-check.fdi to /etc/hal/fdi/policy/ to
+ disable media checks for your drive.  This file disables media checks for
+ all CD drives on the system, and also includes an example config for
+ disabling media checks only on a specific drive.

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2007-02-13 18:24:10 UTC (rev 1242)
+++ packages/unstable/hal/debian/changelog	2007-02-18 11:43:48 UTC (rev 1243)
@@ -1,3 +1,22 @@
+hal (0.5.8.1-7) unstable; urgency=low
+
+  * Acknowledge Steve Langasek's NMU. (Closes: #370186) 
+  * debian/patches/29_handle_non_hal_mounts.patch
+    - Added. Handle volume removal for mounted volumed that weren't mounted by
+      hal correctly.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 18 Feb 2007 12:39:21 +0100
+
+hal (0.5.8.1-6.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Provide /usr/share/doc/hal/examples/no-cd-media-check.fdi as an example
+    for disabling CD ROM media checks, and document this in README.Debian, as
+    a workaround for CD drives with broken firmware.  Closes: #370186.
+
+ -- Steve Langasek <vorlon at debian.org>  Mon, 12 Feb 2007 16:42:29 -0800
+
 hal (0.5.8.1-6) unstable; urgency=low
 
   * debian/patches/19_sonypi_support.patch

Added: packages/unstable/hal/debian/hal.examples
===================================================================
--- packages/unstable/hal/debian/hal.examples	2007-02-13 18:24:10 UTC (rev 1242)
+++ packages/unstable/hal/debian/hal.examples	2007-02-18 11:43:48 UTC (rev 1243)
@@ -0,0 +1 @@
+debian/no-cd-media-check.fdi

Added: packages/unstable/hal/debian/no-cd-media-check.fdi
===================================================================
--- packages/unstable/hal/debian/no-cd-media-check.fdi	2007-02-13 18:24:10 UTC (rev 1242)
+++ packages/unstable/hal/debian/no-cd-media-check.fdi	2007-02-18 11:43:48 UTC (rev 1243)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+
+<!-- 
+  An example fdi config that disables media checks on CD devices, to work
+  around certain hardware bugs described in Debian bug #370186
+-->
+<deviceinfo version="0.2">
+
+<!-- 
+  The following disables the use of hald-addon-storage for all CD/DVD devices
+  on the system.
+-->
+  <device>
+    <match key="storage.cdrom.cdr" bool="true">
+      <merge key="info.addons" type="strlist"></merge>
+    </match>
+  </device>
+
+<!-- 
+  The following disables the use of hald-addon-storage for specific CD
+  devices, by name.  You can find the name of your particular CD device
+  using the 'lshal' command.
+-->
+  <device>
+    <match key="info.product" string="HL-DT-STDVD-ROM GDR8162B">
+      <merge key="info.addons" type="strlist"></merge>
+    </match>
+  </device>
+  <device>
+    <match key="info.product" string="HL-DT-ST DVDRAM GSA-4080N">
+      <merge key="info.addons" type="strlist"></merge>
+    </match>
+  </device>
+
+</deviceinfo>
+

Added: packages/unstable/hal/debian/patches/29_handle_non_hal_mounts.patch
===================================================================
--- packages/unstable/hal/debian/patches/29_handle_non_hal_mounts.patch	2007-02-13 18:24:10 UTC (rev 1242)
+++ packages/unstable/hal/debian/patches/29_handle_non_hal_mounts.patch	2007-02-18 11:43:48 UTC (rev 1243)
@@ -0,0 +1,17 @@
+diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
+index 6c43ba2..d2f3164 100644
+--- a/hald/linux/blockdev.c
++++ b/hald/linux/blockdev.c
+@@ -1211,9 +1211,9 @@ force_unmount (HalDevice *d, void *end_token)
+ 					cleanup_mountpoint_cb,
+ 					g_strdup (mount_point), NULL);
+ */
+-	}
+-
+-
++	} else {
++		hal_util_callout_device_remove (d, blockdev_callouts_remove_done, end_token, NULL);
++  }
+ }
+ 
+ void