Please merge lvm2 (main) 2.02.98-6 from Debian unstable (main)

Bug #1225149 reported by Adam Gandelman
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
lvm2 (Ubuntu)
Fix Released
Undecided
Dimitri John Ledkov

Bug Description

This merges Debian 2.02.98-6, which contains a number of fixes to udev rules that seem to fix many strange issue's I've been hitting on Saucy wrt LVM snapshot deletion. Not sure if this requires a FFe, but I'd be happy to file if it does.

lvm2 (2.02.98-6ubuntu1) saucy; urgency=low

  * Merge from Debian unstable (LP: #1223576), remaining changes:
    - Only build clvm support for corosync:
      - debian/control: Drop Build-Depends on libcman-dev, openais-dev
      - debian/rules: Remove openais + cman from --with-clvmd build option.
    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
      names in /dev/block/ since lvm.conf won't handle this.
    - debian/rules:
      - copy .po file to .pot file for Rosetta (Ubuntu specific).
    - debian/{dmsetup,lvm2}-udeb.install:
      - install initramfs and udev hooks in udebs (Debian bug 504341).
    - auto-start VGs as their PVs are discovered (Ubuntu specific):
      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
        - add 85-lvm2.rules to the list of udev rules to copy.
        - depend on udev.
      - debian/control:
        - add versioned Depend on watershed in lvm2 for udev rules.
        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
        - add Depend on initramfs-tools in dmsetup so system is not potentially
          rendered unbootable by out-of-order dpkg configuration.
        - In libdevmapper-event1.02.1 add Breaks: dmeventd
          (<< 2.02.95-4ubuntu1) due to debian symbol rename
      - debian/rules:
        - do not install local-top scripts since Ubuntu mounts root using udev.
        - do not install init scripts for lvm2, since udev starts LVM.
        - continue to build clvm support.
      - debian/lvm2.postinst: handle missing lvm2 init script.
      - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
        watch dm devices for changes with inotify
    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
    - remaining changes to upstream event manager packages (Debian bug 514706):
      - debian/rules:
        - enable dmeventd during configure.
      - debian/dmeventd.{8,manpages}: install dmeventd files.
    - rename debian/clvm.defaults to debian/clvm.default so it is installed
      correctly.
    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
      executable. When the Ubuntu-specific ones are added with a patch,
      they may lose their executable bit.
    - Add and install clvmd resource agent
    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
      works.
    - debian/{clvmd.ra,clvm.init}:
      - create /run/lvm if it doesn't exist.
    - debian/clvm.init:
      - exit 3 if not running on status action.
    - Call dh_installman so that our dmeventd manpage actually gets installed
    - Install the missing fsadm manpage.
    - Complete libdevmapper-dev multiarch:
      - move .so symlinks and pkgconfig files to multiarched locations.
      - mark libdevmapper-dev M-A: same

 -- Adam Gandelman <email address hidden> Thu, 12 Sep 2013 16:03:09 -0700

Related branches

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Looking into this.

Changed in lvm2 (Ubuntu):
assignee: nobody → Dmitrijs Ledkovs (xnox)
status: New → Confirmed
Revision history for this message
Dimitri John Ledkov (xnox) wrote :
Revision history for this message
Dimitri John Ledkov (xnox) wrote :
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

This package has indeed a very complex set of changes to merge in. Thus I had to redo the merge from scratch to validate that changes are correct. Above is yours and mine debdiffs for comparison. Here is the review:

* clvm.defaults -> note this is a bug, this file has been explicitely renamed to .default such that dh_installinit installs it, see debian/changelog.

* clvm.init -> has spurious whitespace change w.r.t. previous ubuntu.

* dlm >> 2 dependency. Good catch, but we are diverged on Build-Depends anyway.

Also I updated debian/changelog to explicitly list where we are adding divergence from debian packaging & what changes were dropped. Such that next time someone merges, it's easy to see that all changes are accounted for.

Overall it's quite good, but I'll upload my merge of this. Thanks for bringing this up.

Changed in lvm2 (Ubuntu):
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.