[Pkg-utopia-maintainers] Bug#545032: devicekit-disks - Handles add actions of dm devices

[Raphael Hertzog]

On Sun, 18 Oct 2009, Bastian Blank wrote:
> On Fri, Oct 16, 2009 at 11:55:55PM +0200, Bastian Blank wrote:
> > On Fri, Oct 16, 2009 at 11:43:52PM +0200, Bastian Blank wrote:
> > > Okay. What about point 1 of my list? This still probes device-mapper
> > > devices.
> 
> | - Probe for partitions, aka open, on all block devices with a (small)
> |   blacklist. This can be only allowed with a whitelist, as several
> |   device types may not be queried from add events or not at all, like
> |   several dm subtypes.
> 
> > This patch should use an apropriate whitelist.
> 
> Actually it lacks some safe device types.
> 
[ snip patch ]
>
> And while you are at it, add dasd*|cciss* to the presentation list.

I prepared an NMU with the two above changes, Bastian can you confirm that
those are the last changes that you require to drop the Conflicts?

Michael or Martin, can you integrate those 2 patches and upload?

Cheers,
-- 
Raphaël Hertzog
-------------- next part --------------
diff -u devicekit-disks-008/debian/changelog devicekit-disks-008/debian/changelog
--- devicekit-disks-008/debian/changelog
+++ devicekit-disks-008/debian/changelog
@@ -1,3 +1,10 @@
+devicekit-disks (008-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix udev rules to not mess with the lvm ones. Closes: #545032
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Wed, 04 Nov 2009 08:47:10 +0100
+
 devicekit-disks (008-1) unstable; urgency=low
 
   * New upstream release.
diff -u devicekit-disks-008/debian/patches/series devicekit-disks-008/debian/patches/series
--- devicekit-disks-008/debian/patches/series
+++ devicekit-disks-008/debian/patches/series
@@ -4,0 +5,2 @@
+09-whitelist-for-parttable-probing
+10-extend-presentation-list
only in patch2:
unchanged:
--- devicekit-disks-008.orig/debian/patches/10-extend-presentation-list
+++ devicekit-disks-008/debian/patches/10-extend-presentation-list
@@ -0,0 +1,18 @@
+Subject: extend list of devices that can be mounted
+
+dasd* and cciss* devices are real disks that can be mounted. Add them to
+the whitelist of devices that can be automounted.
+
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545032#143
+
+--- a/data/95-devkit-disks.rules
++++ b/data/95-devkit-disks.rules
+@@ -130,7 +130,7 @@ ENV{ID_FS_TYPE}=="ntfs|vfat", \
+ #
+ 
+ ENV{DKD_PRESENTATION_NOPOLICY}="1"
+-KERNEL=="sd*|hd*|sr*|mmcblk*|mspblk*", ENV{DKD_PRESENTATION_NOPOLICY}="0"
++KERNEL=="sd*|hd*|sr*|mmcblk*|mspblk*|dasd*|cciss*", ENV{DKD_PRESENTATION_NOPOLICY}="0"
+ 
+ ##############################################################################################################
+ 
only in patch2:
unchanged:
--- devicekit-disks-008.orig/debian/patches/09-whitelist-for-parttable-probing
+++ devicekit-disks-008/debian/patches/09-whitelist-for-parttable-probing
@@ -0,0 +1,20 @@
+From: Bastian Blank <waldi at debian.org>
+Subject: use whitelist for devices with partition table that can be probed
+
+With a blacklist, it can break as soon as a new block device is added
+if it can't be blindly opened at the time this rule is executed.
+
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545032#143
+--- a/data/95-devkit-disks.rules
++++ b/data/95-devkit-disks.rules
+@@ -11,8 +11,8 @@ KERNEL=="loop*|ram*", GOTO="devkit_disks
+ # Probe for partition tables; this really should be part of udev
+ #
+ 
+-# skip rules for inappropriate block devices
+-KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*", GOTO="probe_parttable_end"
++# scan parttable only for block devices that support it
++KERNEL!="hd*|sd*|sr*|cciss*|dasd*|mmcblk*|mspblk*", GOTO="probe_parttable_end"
+ 
+ # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
+ KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="probe_parttable_end"