-
Committer:
Bazaar Package Importer
-
Author(s):
Kees Cook
-
Date:
2010-02-16 10:40:31 UTC
-
mfrom:
(1.1.10 upstream)
(3.1.8 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100216104031-whf6ccjgvbd20mtt
Tags: 2.02.54-1ubuntu1
* Merge from debian testing. Remaining changes:
- debian/control:
- add libtool for autoconf regeneration.
- debian/patches/avoid-dev-block.patch: Prefer any other device name over
names in /dev/block/ since lvm.conf won't handle this (Debian bug 569290).
- debian/rules:
- copy .po file to .pot file for Rosetta (Ubuntu specific).
- 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 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.
- 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.
- 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.
- debian/patches/open-readonly.patch: do not open every device for
write, otherwise udev thinks they've all changed (see inotify above).
- add mountroot failure hooks to help fix bad boots (Debian bug 468115):
- debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
- add packages for upstream event manager (Debian bug 514706):
- debian/control: define libdevmapper-event1.02.1 and dmeventd packages.
- debian/rules:
- enable dmeventd during configure.
- add build targets.
- fix shlibs invocation with a cleared DH_OPTIONS to get udeb shlibs.
- debian/patches/rules-subdir.patch: update to reorder build targets.
- debian/patches/libdm-event-static.patch: force static library build.
- debian/dmeventd.{install,8,manpages}: install dmeventd files.
- debian/libdevmapper-event*.{install,symbols}: install dmeventd files.
- debian/libdevmapper-dev.install: install libdevmapper-event files.
- debian/patches/monitoring-default-off.patch: by default, do not
expect to talk to dmeventd. Monitoring can be done via "--monitor y".
* debian/rules: make dmsetup initramfs-tools scripts executable (Debian bug
569286).
* rename debian/clvm.defaults to debian/clvm.default so it is intalled
correctly (Debian bug 569292).
* debian/control: bump up to libreadline6-dev for build.
* debian/{lvm2,dmsetup}.preinst: remove obsolete udev rules from Hardy.
* debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules: include *_mlog in
devices to be ignored for filesystem symlinks (Debian bug 569745).