[Pkg-utopia-commits] r3646 - in /packages/unstable/hal/debian: changelog patches/20-ignore-temporary-cryptsetup-devices.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 17 01:13:37 2010
New Revision: 3646

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3646
Log:
* debian/patches/20-ignore-temporary-cryptsetup-devices.patch
  - Do not probe temporary cryptsetup devices. (Closes: #586286)

Added:
    packages/unstable/hal/debian/patches/20-ignore-temporary-cryptsetup-devices.patch
Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/patches/series

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3646&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Sat Jul 17 01:13:37 2010
@@ -5,6 +5,8 @@
     - Drop Build-Depends on quilt.
     - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
     - Remove debian/README.source.
+  * debian/patches/20-ignore-temporary-cryptsetup-devices.patch
+    - Do not probe temporary cryptsetup devices. (Closes: #586286)
 
  -- Michael Biebl <biebl at debian.org>  Sat, 17 Jul 2010 02:56:26 +0200
 

Added: packages/unstable/hal/debian/patches/20-ignore-temporary-cryptsetup-devices.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/20-ignore-temporary-cryptsetup-devices.patch?rev=3646&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/20-ignore-temporary-cryptsetup-devices.patch (added)
+++ packages/unstable/hal/debian/patches/20-ignore-temporary-cryptsetup-devices.patch Sat Jul 17 01:13:37 2010
@@ -1,0 +1,43 @@
+Subject: [PATCH] HAL: Ignore internal DM devices with new DM udev rules
+From: Milan Broz <mbroz at redhat.com>
+Date: Tue, 13 Jul 2010 14:08:14 +0200
+
+With new device-mapper udev rules are /dev/mapper/* symlinks
+to basic device name /dev/dm-X.
+(Change requested by udev upstream.)
+
+This change breaks temporary-cryptsetup workaround inside hal.
+
+With new dm-udev rules (uncluded since device-mapper 1.02.39)
+there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable
+which controls that scan should be ignored for this device
+(it is set for all internal devices, including temporary cryptsetup,
+internal parts of lvm devices etc.)
+
+Ignore device if this flag is set.
+
+See bugs
+https://bugzilla.redhat.com/show_bug.cgi?id=613909
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286
+
+Signed-off-by: Milan Broz <mbroz at redhat.com>
+---
+ hald/linux/osspec.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
+index a8233fd..6d616bc 100644
+--- a/hald/linux/osspec.c
++++ b/hald/linux/osspec.c
+@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
+ 				g_free (str);
+ 			}
+ 			g_free (dstr);
++		} else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
++			if (strtoul(&key[33], NULL, 10) == 1) {
++				HAL_INFO (("ignoring device requested by DM udev rules"));
++				goto invalid;
++			}
+ 		}
+ 	}
+ 

Modified: packages/unstable/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/series?rev=3646&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/series (original)
+++ packages/unstable/hal/debian/patches/series Sat Jul 17 01:13:37 2010
@@ -2,6 +2,7 @@
 01_at_console.patch
 10_nonpolkit-mount-policy.patch
 15-probe-input-segfault-fix.patch
+20-ignore-temporary-cryptsetup-devices.patch
 40_readme_remove_hacking.patch
 45-fix-libusb-detection.patch
 50-kfreebsd-setproctitle.patch