diff -Nru lvm2-2.02.98/debian/changelog lvm2-2.02.98/debian/changelog --- lvm2-2.02.98/debian/changelog 2013-08-28 10:46:43.000000000 +0100 +++ lvm2-2.02.98/debian/changelog 2013-09-16 10:50:32.000000000 +0100 @@ -1,3 +1,104 @@ +lvm2 (2.02.98-6ubuntu1) saucy; urgency=low + + * Merge from Debian unstable (LP: #1223576), (LP: #1225149). 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 Thu, 12 Sep 2013 16:03:09 -0700 + +lvm2 (2.02.98-6) unstable; urgency=low + + * Update init script: + - Use auto-activation. + - Drop manual loading of dm-mod. + * Fix udev rules: + - Re-add another oversight. + + -- Bastian Blank Tue, 27 Aug 2013 13:13:17 +0200 + +lvm2 (2.02.98-5) unstable; urgency=low + + * Fix udev rules. + - Properly exclude special devices, this part got lost. (closes: #718582) + - Always call udev sync. + + -- Bastian Blank Wed, 07 Aug 2013 15:10:23 +0200 + +lvm2 (2.02.98-4) unstable; urgency=low + + * Drop still broken udev stuff. (closes: #712049) + * Make thin support usable: + - Suggest thin-privisioning-tools. + - Set correct location for thin_check binary. + + -- Bastian Blank Sun, 14 Jul 2013 16:37:56 +0200 + +lvm2 (2.02.98-3) unstable; urgency=low + + * Revert udev rules. (closes: #711740) + + -- Bastian Blank Sun, 09 Jun 2013 22:08:02 +0200 + +lvm2 (2.02.98-2) unstable; urgency=low + + * Use udev monitor for synchronization. + * Fix wrong disable in udev rules. + + -- Bastian Blank Sat, 08 Jun 2013 12:50:57 +0200 + lvm2 (2.02.98-1ubuntu5) saucy; urgency=low * Reenabled clvm @@ -97,9 +198,18 @@ lvm2 (2.02.98-1) unstable; urgency=low * New upstream version. + * Re-enable thin support. -- Bastian Blank Sun, 03 Mar 2013 12:33:47 +0100 +lvm2 (2.02.95-7) testing; urgency=low + + * Re-enable cluster support. (closes: #697676) + * Disable thin support. We lack the thin_check binary and it does not work + anyway. (closes: #702163) + + -- Bastian Blank Sun, 24 Mar 2013 09:03:10 +0100 + lvm2 (2.02.95-6ubuntu4) raring; urgency=low * Actually just update all device-types to latest available. (LP: #1122445) diff -Nru lvm2-2.02.98/debian/clvm.defaults lvm2-2.02.98/debian/clvm.defaults --- lvm2-2.02.98/debian/clvm.defaults 1970-01-01 01:00:00.000000000 +0100 +++ lvm2-2.02.98/debian/clvm.defaults 2013-09-16 10:50:32.000000000 +0100 @@ -0,0 +1,9 @@ +# Bourne shell compatible script, sourced by /etc/init.d/clvm to set +# additional arguments for clvmd. + +# Startup timeout: +CLVMDTIMEOUT=20 + +# Volume groups to activate on startup: +# LVM_VGS="cluster_vg1 cluster_vg2" + diff -Nru lvm2-2.02.98/debian/clvm.init lvm2-2.02.98/debian/clvm.init --- lvm2-2.02.98/debian/clvm.init 2013-08-28 10:38:36.000000000 +0100 +++ lvm2-2.02.98/debian/clvm.init 2013-09-16 10:50:32.000000000 +0100 @@ -47,7 +47,7 @@ do_start() { if [ ! -d "/run/lvm" ]; then - mkdir /run/lvm + mkdir /run/lvm fi start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS || status="$?" # flush cache diff -Nru lvm2-2.02.98/debian/control lvm2-2.02.98/debian/control --- lvm2-2.02.98/debian/control 2013-08-28 10:38:57.000000000 +0100 +++ lvm2-2.02.98/debian/control 2013-09-16 10:50:32.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Debian LVM Team Uploaders: Bastian Blank -Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcorosync-dev, libdlm-dev, libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config +Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config Standards-Version: 3.9.1 Homepage: http://sources.redhat.com/lvm2/ XS-Debian-Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/ @@ -13,6 +13,7 @@ Package: lvm2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, dmsetup (>> 2:1.02.47), initscripts (>= 2.88dsf-13.3), watershed (>= 2) +Suggests: thin-provisioning-tools Breaks: initramfs-tools (<< 0.99) Multi-Arch: foreign Description: Linux Logical Volume Manager diff -Nru lvm2-2.02.98/debian/lvm2.init lvm2-2.02.98/debian/lvm2.init --- lvm2-2.02.98/debian/lvm2.init 2013-08-28 10:38:36.000000000 +0100 +++ lvm2-2.02.98/debian/lvm2.init 2013-09-16 10:50:32.000000000 +0100 @@ -17,21 +17,11 @@ [ -x /sbin/vgchange ] || exit 0 -do_start() -{ - modprobe dm-mod 2>/dev/null || : - /sbin/vgscan --ignorelockingfailure >/dev/null || : - /sbin/vgchange -aly --ignorelockingfailure >/dev/null || return 2 -} - case "$1" in start) log_action_begin_msg "Setting up LVM Volume Groups" - do_start - case "$?" in - 0|1) log_action_end_msg 0 ;; - 2) log_action_end_msg 1 ;; - esac + /sbin/lvm vgchange -aay --sysinit >/dev/null + log_action_end_msg "$?" ;; stop|restart|force-reload|status) ;; diff -Nru lvm2-2.02.98/debian/rules lvm2-2.02.98/debian/rules --- lvm2-2.02.98/debian/rules 2013-08-28 10:38:57.000000000 +0100 +++ lvm2-2.02.98/debian/rules 2013-09-16 10:50:32.000000000 +0100 @@ -86,7 +86,7 @@ --with-default-run-dir=/run/lvm \ --with-default-locking-dir=/run/lock/lvm \ --with-thin=internal \ - --with-thin-check=/sbin/thin_check \ + --with-thin-check=/usr/sbin/thin_check \ --enable-applib \ --enable-cmdlib \ --enable-dmeventd \ diff -Nru lvm2-2.02.98/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules lvm2-2.02.98/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules --- lvm2-2.02.98/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules 2013-08-28 10:38:36.000000000 +0100 +++ lvm2-2.02.98/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules 2013-09-16 10:50:32.000000000 +0100 @@ -3,9 +3,6 @@ KERNEL=="device-mapper", NAME="mapper/control" -SUBSYSTEM!="block", GOTO="dm_end" -KERNEL!="dm-[0-9]*", GOTO="dm_end" - # Decode udev control flags and set environment variables appropriately. # These flags are encoded in DM_COOKIE variable that was introduced in # kernel version 2.6.31. Therefore, we can use this feature with @@ -13,6 +10,9 @@ ENV{DM_COOKIE}=="?*", IMPORT{program}="/sbin/dmsetup udevflags $env{DM_COOKIE}" ENV{DM_COOKIE}=="?*", RUN+="/sbin/dmsetup udevcomplete $env{DM_COOKIE}" +SUBSYSTEM!="block", GOTO="dm_end" +KERNEL!="dm-[0-9]*", GOTO="dm_end" + # Device created, major and minor number assigned - "add" event generated. # Table loaded - no event generated. # Device resumed (or renamed) - "change" event generated. diff -Nru lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules --- lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules 2013-08-28 10:38:36.000000000 +0100 +++ lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules 2013-09-16 10:50:32.000000000 +0100 @@ -8,8 +8,16 @@ # Use DM name and split it up into its VG/LV/layer constituents. IMPORT{program}="/sbin/dmsetup splitname --nameprefixes --noheadings --rows $env{DM_NAME}" -ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}!="1", GOTO="lvm_end" +ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" +# Do not create symlinks for inappropriate subdevices. +ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable" +ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" + +# Create symlinks for top-level devices only. +ENV{DM_VG_NAME}=="?*", ENV{DM_LV_NAME}=="?*", SYMLINK+="$env{DM_VG_NAME}/$env{DM_LV_NAME}", GOTO="lvm_end" + +LABEL="lvm_disable" ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1" ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1" OPTIONS:="nowatch" diff -Nru lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules --- lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules 2013-08-28 10:38:36.000000000 +0100 +++ lvm2-2.02.98/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# Udev rules for LVM. -# See /usr/share/doc/lvm2/README.udev for further information. - -ACTION!="add|change", GOTO="persistent_storage_lvm_end" -ENV{DM_UDEV_RULES}=="", GOTO="persistent_storage_lvm_end" -ENV{DM_UUID}!="LVM-?*", GOTO="persistent_storage_lvm_end" - -ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="persistent_storage_lvm_end" - -ENV{DM_VG_NAME}=="?*", ENV{DM_LV_NAME}=="?*", ENV{DM_LV_LAYER}=="", SYMLINK+="$env{DM_VG_NAME}/$env{DM_LV_NAME}" - -LABEL="persistent_storage_lvm_end"