patchdir/fix-udev-rules.patch

   1  Use udev rules provided by upstream packages
   2
   3  The debian version 55-dm.rules triggers bug #127 with our setup (rhel kernel).
   4
   5 Index: LVM2.2.02.95/debian/dmsetup.install
   6 ===================================================================
   7 --- LVM2.2.02.95.orig/debian/dmsetup.install    2010-03-16 20:58:19.000000000 +0100
   8 +++ LVM2.2.02.95/debian/dmsetup.install 2012-04-27 09:17:05.000000000 +0200
   9 @@ -1,3 +1,7 @@
  10 -../../tree/dmsetup/* /
  11 +../../tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup /usr/share/initramfs-tools/hooks
  12 +lib/udev/rules.d/55-dm.rules
  13 +lib/udev/rules.d/60-persistent-storage-dm.rules
  14 +lib/udev/rules.d/95-dm-notify.rules
  15  sbin/dmsetup
  16  usr/share/man/man8/dmsetup.8
  17 +
  18 Index: LVM2.2.02.95/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup
  19 ===================================================================
  20 --- LVM2.2.02.95.orig/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup       2009-10-12 04:39:36.000000000 +0200
  21 +++ LVM2.2.02.95/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup    2012-04-27 09:17:05.000000000 +0200
  22 @@ -10,7 +10,7 @@
  23  . /usr/share/initramfs-tools/hook-functions
  24
  25  mkdir -p $DESTDIR/lib/udev/rules.d/
  26 -for rules in 55-dm.rules 60-persistent-storage-dm.rules; do
  27 +for rules in 55-dm.rules 60-persistent-storage-dm.rules 95-dm-notify.rules; do
  28         if   [ -e /etc/udev/rules.d/$rules ]; then
  29                 cp -p /etc/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
  30         elif [ -e /lib/udev/rules.d/$rules ]; then
  31 Index: LVM2.2.02.95/debian/rules
  32 ===================================================================
  33 --- LVM2.2.02.95.orig/debian/rules      2012-04-27 09:17:05.000000000 +0200
  34 +++ LVM2.2.02.95/debian/rules   2012-04-27 09:19:15.000000000 +0200
  35 @@ -1,6 +1,6 @@
  36  #!/usr/bin/make -f
  37
  38 -# Uncomment this to turn on verbose mode.
  39 +# Uncomment this to turn on verbose mode.
  40  #export DH_VERBOSE=1
  41
  42  DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  43 @@ -163,7 +163,10 @@
  44
  45  install_dmsetup: export DH_OPTIONS = -pdmsetup
  46  install_dmsetup: DIR = $(BUILD_DIR)/install_deb
  47 +install_dmsetup: UDEVDIR = $(BUILD_DIR)/install_deb/lib/udev/rules.d
  48  install_dmsetup: $(STAMPS_DIR)/install_deb
  49 +       mv $(UDEVDIR)/10-dm.rules $(UDEVDIR)/55-dm.rules
  50 +       mv $(UDEVDIR)/13-dm-disk.rules $(UDEVDIR)/60-persistent-storage-dm.rules
  51         +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
  52         +$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
  53
  54 @@ -212,7 +215,9 @@
  55
  56  install_lvm2: export DH_OPTIONS = -plvm2
  57  install_lvm2: DIR = $(BUILD_DIR)/install_deb
  58 +install_lvm2: UDEVDIR = $(BUILD_DIR)/install_deb/lib/udev/rules.d
  59  install_lvm2: $(STAMPS_DIR)/install_deb
  60 +       mv $(UDEVDIR)/11-dm-lvm.rules $(UDEVDIR)/56-lvm.rules
  61         +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
  62         dh_installinit --no-start -- start 26 S .
  63         +$(MAKE_SELF) install-base
  64 Index: LVM2.2.02.95/debian/lvm2.install
  65 ===================================================================
  66 --- LVM2.2.02.95.orig/debian/lvm2.install       2012-04-27 09:17:05.000000000 +0200
  67 +++ LVM2.2.02.95/debian/lvm2.install    2012-04-27 09:17:05.000000000 +0200
  68 @@ -1,4 +1,4 @@
  69 -../../tree/lvm2/* /
  70 +lib/udev/rules.d/56-lvm.rules
  71  etc/lvm/lvm.conf
  72  sbin/fsadm
  73  sbin/lv*