udisks: Hack to work with the latest udev

We should probably update to udisks2, but I'm not sure if it's
compatible at the D-Bus interface level.

http://hydra.nixos.org/build/3488623
This commit is contained in:
Eelco Dolstra 2012-12-13 13:14:58 +01:00
parent 726b1bebbc
commit b11e1305b5
2 changed files with 14 additions and 6 deletions

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
};
patches = [ ./purity.patch ];
patches = [ ./purity.patch ./no-pci-db.patch ];
postPatch =
''
@ -30,11 +30,6 @@ stdenv.mkDerivation rec {
configureFlags = "--localstatedir=/var --enable-lvm2";
preConfigure =
''
# Ensure that udisks can find the necessary programs.
'';
meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks;
description = "A daemon and command-line utility for querying and manipulating storage devices";

View file

@ -0,0 +1,13 @@
Systemd no longer has the pci-db program.
diff -ru -x '*~' udisks-1.0.4-orig/data/80-udisks.rules udisks-1.0.4/data/80-udisks.rules
--- udisks-1.0.4-orig/data/80-udisks.rules 2011-08-25 23:31:20.000000000 +0200
+++ udisks-1.0.4/data/80-udisks.rules 2012-12-13 13:06:52.189650854 +0100
@@ -3,7 +3,6 @@
# import names for PCI storage controllers
#
-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
# Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
# the device is on a cardbus controller (upper PCI device) - then we check