lp:~gandelman-a/ubuntu/saucy/lvm2/lp1223576
- Get this branch:
- bzr branch lp:~gandelman-a/ubuntu/saucy/lvm2/lp1223576
Branch merges
- Dimitri John Ledkov: Approve
-
Diff: 19303 lines (+290/-18358)50 files modified.pc/applied-patches (+0/-9)
.pc/avoid-dev-block.patch/lib/device/dev-cache.c (+0/-1037)
.pc/dirs.patch/daemons/dmeventd/Makefile.in (+0/-108)
.pc/dirs.patch/daemons/dmeventd/dmeventd.c (+0/-2026)
.pc/dirs.patch/doc/example.conf.in (+0/-816)
.pc/dirs.patch/lib/commands/toolcontext.c (+0/-1688)
.pc/dm-event-api.patch/daemons/dmeventd/.exported_symbols (+0/-4)
.pc/dm-event-api.patch/daemons/dmeventd/dmeventd.c (+0/-2035)
.pc/dm-event-api.patch/daemons/dmeventd/libdevmapper-event.c (+0/-870)
.pc/force-modprobe.patch/configure.in (+0/-1632)
.pc/implicit-pointer.patch/tools/lvm.c (+0/-253)
.pc/install.patch/daemons/dmeventd/plugins/lvm2/Makefile.in (+0/-31)
.pc/install.patch/daemons/dmeventd/plugins/mirror/Makefile.in (+0/-37)
.pc/install.patch/daemons/dmeventd/plugins/raid/Makefile.in (+0/-36)
.pc/install.patch/daemons/dmeventd/plugins/snapshot/Makefile.in (+0/-33)
.pc/install.patch/daemons/dmeventd/plugins/thin/Makefile.in (+0/-36)
.pc/install.patch/make.tmpl.in (+0/-412)
.pc/libs-cleanup.patch/configure.in (+0/-1685)
.pc/missing-dmeventd.patch/daemons/dmeventd/libdevmapper-event.c (+0/-870)
.pc/missing-dmeventd.patch/lib/activate/activate.c (+0/-1954)
.pc/monitoring-default-off.patch/doc/example.conf.in (+0/-816)
.pc/monitoring-default-off.patch/lib/config/defaults.h (+0/-180)
.pc/monitoring-default-off.patch/tools/toollib.c (+0/-1632)
configure.in (+65/-8)
daemons/dmeventd/.exported_symbols (+3/-3)
daemons/dmeventd/Makefile.in (+0/-1)
daemons/dmeventd/dmeventd.c (+8/-17)
daemons/dmeventd/libdevmapper-event.c (+13/-25)
daemons/dmeventd/plugins/lvm2/Makefile.in (+1/-1)
daemons/dmeventd/plugins/mirror/Makefile.in (+0/-1)
daemons/dmeventd/plugins/raid/Makefile.in (+0/-1)
daemons/dmeventd/plugins/snapshot/Makefile.in (+0/-1)
daemons/dmeventd/plugins/thin/Makefile.in (+0/-1)
debian/changelog (+110/-0)
debian/clvm.defaults (+9/-0)
debian/clvm.init (+1/-1)
debian/control (+2/-1)
debian/lvm2.init (+2/-12)
debian/rules (+1/-1)
debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules (+3/-3)
debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules (+10/-2)
debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules (+0/-12)
doc/example.conf.in (+3/-3)
lib/activate/activate.c (+20/-27)
lib/commands/toolcontext.c (+6/-4)
lib/config/defaults.h (+1/-1)
lib/device/dev-cache.c (+0/-15)
make.tmpl.in (+21/-10)
tools/lvm.c (+3/-0)
tools/toollib.c (+8/-7)
Related bugs
Bug #1225149: Please merge lvm2 (main) 2.02.98-6 from Debian unstable (main) | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Adam Gandelman
- Status:
- Development
Recent revisions
- 83. By Adam Gandelman
-
* 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
* Update init script:
- Use auto-activation.
- Drop manual loading of dm-mod.
* Fix udev rules:
- Re-add another oversight.
* Fix udev rules.
- Properly exclude special devices, this part got lost. (closes: #718582)
- Always call udev sync.
* Drop still broken udev stuff. (closes: #712049)
* Make thin support usable:
- Suggest thin-privisioning-tools.
- Set correct location for thin_check binary.
* Revert udev rules. (closes: #711740)
* Use udev monitor for synchronization.
* Fix wrong disable in udev rules.
* Re-enable thin support.
* Re-enable cluster support. (closes: #697676)
* Disable thin support. We lack the thin_check binary and it does not work
anyway. (closes: #702163) - 81. By Andy Whitcroft
-
hooks/lvm2: add dm_raid to the dm personality modules to be included in
the initramfs as this is a valid personality for the root filesystem
and such volumes lead to extended boot times and boot failures.
(LP: #1206235) - 80. By Andres Rodriguez
-
* Disable clvm for the time being, given that redhat-cluster will soon
be removed from the archives (provides libdml-dev, libcman-dev), in
favor of the new cluster stack (corosync). Once corosync > 2.X is
released and a new source package 'dlm' (will provide libdlm-dev)
hits the archive, clvm can be reenabled.
- debian/control: Drop Build-Depends on libcman-dev, libcorosync-dev,
libdlm-dev, openais-dev; Comment out clvm binary package.
- debian/rules: Do not build --with-clvmd; comment clvm related rules. - 78. By Dimitri John Ledkov
-
* Merge from Debian unstable, remaining changes:
- 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* Dropped changes, applied upstream:
- Update Micron PCIe SSD and other device-types to latest available.
- Cherry pick from upstream, remove unsupported udev_get_dev_path() call.
- Move thin check to global section. - 77. By Dimitri John Ledkov
-
Actually just update all device-types to latest available. (LP: #1122445)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/saucy/lvm2