From: Fabian Grünbichler Date: Mon, 20 Mar 2017 08:31:11 +0000 (+0100) Subject: refresh and drop patches X-Git-Url: https://git.proxmox.com/?p=lvm.git;a=commitdiff_plain;h=ec236ca17ce6830209c94c9e4cc40f29e0a33cea refresh and drop patches --- diff --git a/patchdir/0001-filter-zvols-and-PVE-VG-by-default.patch b/patchdir/0001-filter-zvols-and-PVE-VG-by-default.patch new file mode 100644 index 0000000..02840ef --- /dev/null +++ b/patchdir/0001-filter-zvols-and-PVE-VG-by-default.patch @@ -0,0 +1,30 @@ +From 203694c2e0a77a70b62faf0df5646181cfca8603 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Fri, 17 Mar 2017 11:59:25 +0100 +Subject: [PATCH 1/2] filter zvols and PVE VG by default +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabian Grünbichler +--- + conf/example.conf.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/conf/example.conf.in b/conf/example.conf.in +index 736b4bd..1a8a67b 100644 +--- a/conf/example.conf.in ++++ b/conf/example.conf.in +@@ -125,6 +125,9 @@ devices { + # Run vgscan after changing the filter to regenerate the cache. + # See the use_lvmetad comment for a special case regarding filters. + # ++ # Do not scan ZFS zvols (to avoid problems on ZFS zvols snapshots) ++ global_filter = [ "r|/dev/zd.*|", "r|/dev/mapper/pve-.*|" ] ++ + # Example + # Accept every block device: + # filter = [ "a|.*/|" ] +-- +2.1.4 + diff --git a/patchdir/0002-enable-issue_discards-by-default.patch b/patchdir/0002-enable-issue_discards-by-default.patch new file mode 100644 index 0000000..62ed4d2 --- /dev/null +++ b/patchdir/0002-enable-issue_discards-by-default.patch @@ -0,0 +1,29 @@ +From 1462604ed3fb71fd4540ccfb034fccabce9e585b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Fri, 17 Mar 2017 11:59:54 +0100 +Subject: [PATCH 2/2] enable issue_discards by default +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabian Grünbichler +--- + conf/example.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/conf/example.conf.in b/conf/example.conf.in +index 1a8a67b..56b0795 100644 +--- a/conf/example.conf.in ++++ b/conf/example.conf.in +@@ -301,7 +301,7 @@ devices { + # benefit from discards, but SSDs and thinly provisioned LUNs + # generally do. If enabled, discards will only be issued if both the + # storage and kernel provide support. +- issue_discards = 0 ++ issue_discards = 1 + + # Configuration option devices/allow_changes_with_duplicate_pvs. + # Allow VG modification while a PV appears on multiple devices. +-- +2.1.4 + diff --git a/patchdir/allow-new-symbols.patch b/patchdir/allow-new-symbols.patch deleted file mode 100644 index fb1cc46..0000000 --- a/patchdir/allow-new-symbols.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: LVM2.2.02.95/debian/rules -=================================================================== ---- LVM2.2.02.95.orig/debian/rules 2012-04-23 09:06:04.000000000 +0200 -+++ LVM2.2.02.95/debian/rules 2012-04-23 10:33:59.000000000 +0200 -@@ -183,7 +184,7 @@ - dh_makeshlibs \ - --add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \ - "-Vlibdevmapper$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \ -- -- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2 -+ -- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c1 - +$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)" - - install_libdevmapper-dev: export DH_OPTIONS = -plibdevmapper-dev diff --git a/patchdir/autodetect-locking-type.patch b/patchdir/autodetect-locking-type.patch deleted file mode 100644 index bb4edef..0000000 --- a/patchdir/autodetect-locking-type.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: new/lib/locking/locking.c -=================================================================== ---- new.orig/lib/locking/locking.c 2011-06-11 02:03:07.000000000 +0200 -+++ new/lib/locking/locking.c 2011-09-21 10:01:47.000000000 +0200 -@@ -225,7 +225,16 @@ - suppress_messages = 1; - - if (type < 0) -- type = find_config_tree_int(cmd, "global/locking_type", 1); -+ type = find_config_tree_int(cmd, "global/locking_type", -1); -+ -+ if (type < 0) { -+ struct stat info; -+ if (stat("/etc/cluster/cluster.conf", &info) == 0) { -+ type = 3; -+ } else { -+ type = 1; -+ } -+ } - - _blocking_supported = find_config_tree_int(cmd, - "global/wait_for_locks", DEFAULT_WAIT_FOR_LOCKS); -Index: new/doc/example.conf.in -=================================================================== ---- new.orig/doc/example.conf.in 2011-07-01 16:09:19.000000000 +0200 -+++ new/doc/example.conf.in 2011-09-21 10:01:47.000000000 +0200 -@@ -350,13 +350,16 @@ - proc = "/proc" - - # Type of locking to use. Defaults to local file-based locking (1). -+ # Proxmox VE sets default locking_type to 3 if file -+ # /etc/cluster/cluster.conf exists. So there is normally no need -+ # to set this value here. - # Turn locking off by setting to 0 (dangerous: risks metadata corruption - # if LVM2 commands get run concurrently). - # Type 2 uses the external shared library locking_library. - # Type 3 uses built-in clustered locking. - # Type 4 uses read-only locking which forbids any operations that might - # change metadata. -- locking_type = 1 -+ # locking_type = 1 - - # Set to 0 to fail when a lock request cannot be satisfied immediately. - wait_for_locks = 1 diff --git a/patchdir/configure-with-corosync2.patch b/patchdir/configure-with-corosync2.patch deleted file mode 100644 index 6ab73b2..0000000 --- a/patchdir/configure-with-corosync2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: new/debian/rules -=================================================================== ---- new.orig/debian/rules -+++ new/debian/rules -@@ -76,7 +76,7 @@ $(STAMPS_DIR)/setup_deb: $(STAMPS_DIR)/s - --with-usrlibdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - --with-optimisation="$(CFLAGS_OPT_DEB)" \ - --with-cache=internal \ -- --with-clvmd=cman,corosync,openais \ -+ --with-clvmd=corosync \ - --with-cluster=internal \ - --with-device-uid=0 \ - --with-device-gid=6 \ diff --git a/patchdir/enable-issue-discard.patch b/patchdir/enable-issue-discard.patch deleted file mode 100644 index 8509cba..0000000 --- a/patchdir/enable-issue-discard.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/conf/example.conf.in -+++ b/conf/example.conf.in -@@ -290,7 +290,7 @@ - # to 1, discards will only be issued if both the storage and kernel provide - # support. - # 1 enables; 0 disables. -- issue_discards = 0 -+ issue_discards = 1 - } - - # This section allows you to configure the way in which LVM selects diff --git a/patchdir/filter_zvols_and_pve_vg_in_lvm.conf.patch b/patchdir/filter_zvols_and_pve_vg_in_lvm.conf.patch deleted file mode 100644 index d6c2439..0000000 --- a/patchdir/filter_zvols_and_pve_vg_in_lvm.conf.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/conf/example.conf.in -+++ b/conf/example.conf.in -@@ -118,6 +118,9 @@ - # If lvmetad is used, then see "A note about device filtering while - # lvmetad is used" comment that is attached to global/use_lvmetad setting. - -+ # Do not scan ZFS zvols (to avoid problems on ZFS zvols snapshots) -+ global_filter = [ "r|/dev/zd.*|", "r|/dev/mapper/pve-.*|" ] -+ - # By default we accept every block device: - # filter = [ "a/.*/" ] - diff --git a/patchdir/fix-build-dependencies.patch b/patchdir/fix-build-dependencies.patch deleted file mode 100644 index 8bdb9fa..0000000 --- a/patchdir/fix-build-dependencies.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: lvm2-2.02.98/debian/control -=================================================================== ---- lvm2-2.02.98.orig/debian/control 2013-07-14 16:39:32.000000000 +0200 -+++ lvm2-2.02.98/debian/control 2013-08-13 12:15:25.000000000 +0200 -@@ -1,9 +1,9 @@ - Source: lvm2 - Section: admin - Priority: optional --Maintainer: Debian LVM Team -+Maintainer: Proxmox Support Team - Uploaders: Bastian Blank --Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config -+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libreadline6-dev, libselinux1-dev, libudev-dev, pkg-config, libcorosync-pve-dev, redhat-cluster-pve-dev, libopenais-pve-dev, quilt - Standards-Version: 3.9.1 - Homepage: http://sources.redhat.com/lvm2/ - Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/ -@@ -39,8 +39,7 @@ - Package: clvm - Priority: extra - Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base --Recommends: corosync | openais | cman -+Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, redhat-cluster-pve - Multi-Arch: foreign - Description: Cluster LVM Daemon for lvm2 - This package provides the clustering interface for lvm2, when used with diff --git a/patchdir/fix-changelog.patch b/patchdir/fix-changelog.patch deleted file mode 100644 index b934f91..0000000 --- a/patchdir/fix-changelog.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: new/debian/changelog -=================================================================== ---- new.orig/debian/changelog -+++ new/debian/changelog -@@ -1,3 +1,23 @@ -+lvm2 (2.02.116-pve3) unstable; urgency=medium -+ -+ * rebase discard enable patch and enable it -+ -+ * filter zvols and pve vg in lvm.conf -+ -+ -- Proxmox Support Team Thu, 25 Aug 2016 09:46:08 +0200 -+ -+lvm2 (2.02.116-pve2) unstable; urgency=medium -+ -+ * Insert a scan filter that zfs zvols will not be scanned. -+ -+ -- Proxmox Support Team Fri, 13 Nov 2015 11:04:41 +0100 -+ -+lvm2 (2.02.116-pve1) unstable; urgency=medium -+ -+ * New upstream version. -+ -+ -- Proxmox Support Team Fri, 27 Feb 2015 11:27:16 +0100 -+ - lvm2 (2.02.111-2) unstable; urgency=medium - - * Install additional man-pages. (closes: #587277, #760679) diff --git a/patchdir/fix-clvm-init.patch b/patchdir/fix-clvm-init.patch deleted file mode 100644 index fee0992..0000000 --- a/patchdir/fix-clvm-init.patch +++ /dev/null @@ -1,112 +0,0 @@ -Index: new/debian/clvm.defaults -=================================================================== ---- new.orig/debian/clvm.defaults 2013-03-03 12:46:47.000000000 +0100 -+++ new/debian/clvm.defaults 2013-03-29 08:01:33.000000000 +0100 -@@ -1,9 +1,11 @@ - # Bourne shell compatible script, sourced by /etc/init.d/clvm to set - # additional arguments for clvmd. - -+# enable clmvd -+#START_CLVM=yes -+ - # Startup timeout: --CLVMDTIMEOUT=20 -+#CLVMDTIMEOUT=30 - - # Volume groups to activate on startup: - # LVM_VGS="cluster_vg1 cluster_vg2" -- -Index: new/debian/clvm.init -=================================================================== ---- new.orig/debian/clvm.init 2013-03-03 12:46:47.000000000 +0100 -+++ new/debian/clvm.init 2013-03-29 08:35:07.000000000 +0100 -@@ -2,12 +2,12 @@ - # - ### BEGIN INIT INFO - # Provides: clvm --# Required-Start: lvm2 --# Required-Stop: lvm2 -+# Required-Start: lvm2 cman -+# Required-Stop: lvm2 cman - # Should-Start: cman corosync openais - # Should-Stop: cman corosync openais --# Default-Start: S --# Default-Stop: 0 6 -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 - # Short-Description: start and stop the lvm cluster locking daemon - ### END INIT INFO - # -@@ -28,28 +28,31 @@ - . /lib/lsb/init-functions - - if [ ! -f /etc/cluster/cluster.conf ]; then -- log_failure_msg "clvmd: cluster not configured. Aborting." -+ log_action_msg "clvmd: cluster not configured" - exit 0 - fi - --if ! cman_tool status >/dev/null 2>&1; then -- log_failure_msg "clvmd: cluster is not running. Aborting." -- exit 0 --fi -- --CLVMDTIMEOUT=20 -+CLVMDTIMEOUT=30 -+START_CLVM=no - - # Read configuration variable file if it is present - [ -r /etc/default/$NAME ] && . /etc/default/$NAME - -+[ "$START_CLVM" = "yes" ] || exit 0 -+ - DAEMON_OPTS="-T$CLVMDTIMEOUT" - -+if ! cman_tool status >/dev/null 2>&1; then -+ log_failure_msg "clvmd: cluster is not running. Aborting." -+ exit 1 -+fi -+ - do_start() - { -- start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS || status="$?" -+ start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS || return $? - # flush cache - vgscan > /dev/null 2>&1 -- return $status -+ return 0 - } - - do_activate() -@@ -57,9 +60,6 @@ - if [ -n "$LVM_VGS" ] ; then - log_action_msg "Activating VGs $LVM_VGS" - vgchange -ayl $LVM_VGS || return $? -- else -- log_action_msg "Activating all VGs" -- vgchange -ayl || return $? - fi - } - -Index: new/debian/rules -=================================================================== ---- new.orig/debian/rules 2013-03-29 08:01:30.000000000 +0100 -+++ new/debian/rules 2013-03-29 08:01:33.000000000 +0100 -@@ -77,7 +77,7 @@ - $(CONFIGURE) \ - --libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \ - --with-optimisation="$(CFLAGS_OPT_DEB)" \ -- --with-clvmd=cman,corosync,openais \ -+ --with-clvmd=cman,corosync \ - --with-cluster=internal \ - --with-device-uid=0 \ - --with-device-gid=6 \ -@@ -165,7 +165,7 @@ - install_clvm: DIR = $(BUILD_DIR)/install_deb - install_clvm: $(STAMPS_DIR)/install_deb - +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)' -- dh_installinit --no-start -- start 63 S . start 51 0 6 . -+ dh_installinit --no-start -- start 63 2 3 4 5 . start 51 0 1 6 . - +$(MAKE_SELF) install-base - - install_dmeventd: export DH_OPTIONS = -pdmeventd diff --git a/patchdir/fix-clvm-service-configuration-dir.patch b/patchdir/fix-clvm-service-configuration-dir.patch deleted file mode 100644 index 9bf33f4..0000000 --- a/patchdir/fix-clvm-service-configuration-dir.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: new/scripts/lvm2_cluster_activation_systemd_red_hat.service.in -=================================================================== ---- new.orig/scripts/lvm2_cluster_activation_systemd_red_hat.service.in -+++ new/scripts/lvm2_cluster_activation_systemd_red_hat.service.in -@@ -9,7 +9,7 @@ Conflicts=shutdown.target - [Service] - Type=simple - RemainAfterExit=yes --EnvironmentFile=-@sysconfdir@/sysconfig/clvmd -+EnvironmentFile=-/etc/default/clvmd - ExecStart=@systemdutildir@/lvm2-cluster-activation activate - ExecStop=@systemdutildir@/lvm2-cluster-activation deactivate - -Index: new/scripts/lvm2_clvmd_systemd_red_hat.service.in -=================================================================== ---- new.orig/scripts/lvm2_clvmd_systemd_red_hat.service.in -+++ new/scripts/lvm2_clvmd_systemd_red_hat.service.in -@@ -13,8 +13,8 @@ Conflicts=shutdown.target - [Service] - Type=forking - Environment=CLVMD_OPTS=-T30 --EnvironmentFile=-@sysconfdir@/sysconfig/clvmd --ExecStart=@sbindir@/clvmd $CLVMD_OPTS -+EnvironmentFile=-/etc/default/clvmd -+ExecStart=/usr/sbin/clvmd $CLVMD_OPTS - SuccessExitStatus=5 - TimeoutStartSec=30 - TimeoutStopSec=10 diff --git a/patchdir/fix-fsadm-install.patch b/patchdir/fix-fsadm-install.patch deleted file mode 100644 index faa6dfc..0000000 --- a/patchdir/fix-fsadm-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: new/debian/lvm2.install -=================================================================== ---- new.orig/debian/lvm2.install 2012-05-27 16:25:21.000000000 +0200 -+++ new/debian/lvm2.install 2013-03-29 06:57:58.000000000 +0100 -@@ -8,3 +8,5 @@ - usr/share/man/man8/pv* - usr/share/man/man8/vg* - usr/share/man/man5 -+usr/share/man/man8/fsadm.8 -+ -Index: new/debian/rules -=================================================================== ---- new.orig/debian/rules 2013-03-03 12:48:24.000000000 +0100 -+++ new/debian/rules 2013-03-29 06:57:58.000000000 +0100 -@@ -84,6 +84,7 @@ - --with-device-mode=0660 \ - --with-default-run-dir=/run/lvm \ - --with-default-locking-dir=/run/lock/lvm \ -+ --enable-fsadm \ - --enable-applib \ - --enable-cmdlib \ - --enable-dmeventd \ diff --git a/patchdir/fix-symbols.patch b/patchdir/fix-symbols.patch deleted file mode 100644 index d8ee189..0000000 --- a/patchdir/fix-symbols.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: new/debian/libdevmapper1.02.1.symbols -=================================================================== ---- new.orig/debian/libdevmapper1.02.1.symbols -+++ new/debian/libdevmapper1.02.1.symbols -@@ -25,6 +25,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02. - dm_config_find_node@Base 2:1.02.74 - dm_config_find_str@Base 2:1.02.74 - dm_config_find_str_allow_empty@Base 2:1.02.74 -+ dm_config_flatten@Base 2:1.02.93 - dm_config_from_string@Base 2:1.02.74 - dm_config_get_custom@Base 2:1.02.74 - dm_config_get_list@Base 2:1.02.74 -@@ -39,6 +40,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02. - dm_config_parent_name@Base 2:1.02.74 - dm_config_parse@Base 2:1.02.74 - dm_config_remove_cascaded_tree@Base 2:1.02.74 -+ dm_config_remove_node@Base 2:1.02.93 - dm_config_set_custom@Base 2:1.02.74 - dm_config_tree_find_bool@Base 2:1.02.74 - dm_config_tree_find_float@Base 2:1.02.74 -@@ -144,6 +146,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02. - dm_regex_create@Base 2:1.02.20 - dm_regex_fingerprint@Base 2:1.02.63 - dm_regex_match@Base 2:1.02.20 -+ dm_report_compact_fields@Base 2:1.02.93 - dm_report_field_int32@Base 2:1.02.27 - dm_report_field_int@Base 2:1.02.27 - dm_report_field_percent@Base 2:1.02.88 -@@ -259,6 +262,7 @@ libdevmapper.so.1.02.1 libdevmapper1.02. - dm_tree_node_set_read_ahead@Base 2:1.02.24 - dm_tree_node_set_thin_external_origin@Base 2:1.02.77 - dm_tree_node_set_thin_pool_discard@Base 2:1.02.77 -+ dm_tree_node_set_thin_pool_error_if_no_space@Base 2:1.02.93 - dm_tree_node_set_udev_flags@Base 2:1.02.74 - dm_tree_node_size_changed@Base 2:1.02.36 - dm_tree_preload_children@Base 2:1.02.20 diff --git a/patchdir/fix-udev-rules.patch b/patchdir/fix-udev-rules.patch deleted file mode 100644 index d636e6c..0000000 --- a/patchdir/fix-udev-rules.patch +++ /dev/null @@ -1,73 +0,0 @@ - Use udev rules provided by upstream packages - - The debian version 55-dm.rules triggers bug #127 with our setup (rhel kernel). - -Index: LVM2.2.02.95/debian/dmsetup.install -=================================================================== ---- LVM2.2.02.95.orig/debian/dmsetup.install 2010-03-16 20:58:19.000000000 +0100 -+++ LVM2.2.02.95/debian/dmsetup.install 2012-04-27 09:17:05.000000000 +0200 -@@ -1,3 +1,7 @@ --../../tree/dmsetup/* / -+../../tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup /usr/share/initramfs-tools/hooks -+lib/udev/rules.d/55-dm.rules -+lib/udev/rules.d/60-persistent-storage-dm.rules -+lib/udev/rules.d/95-dm-notify.rules - sbin/dmsetup - usr/share/man/man8/dmsetup.8 -+ -Index: LVM2.2.02.95/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup -=================================================================== ---- LVM2.2.02.95.orig/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup 2009-10-12 04:39:36.000000000 +0200 -+++ LVM2.2.02.95/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup 2012-04-27 09:17:05.000000000 +0200 -@@ -10,7 +10,7 @@ - . /usr/share/initramfs-tools/hook-functions - - mkdir -p $DESTDIR/lib/udev/rules.d/ --for rules in 55-dm.rules 60-persistent-storage-dm.rules; do -+for rules in 55-dm.rules 60-persistent-storage-dm.rules 95-dm-notify.rules; do - if [ -e /etc/udev/rules.d/$rules ]; then - cp -p /etc/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/ - elif [ -e /lib/udev/rules.d/$rules ]; then -Index: LVM2.2.02.95/debian/rules -=================================================================== ---- LVM2.2.02.95.orig/debian/rules 2012-04-27 09:17:05.000000000 +0200 -+++ LVM2.2.02.95/debian/rules 2012-04-27 09:19:15.000000000 +0200 -@@ -1,6 +1,6 @@ - #!/usr/bin/make -f - --# Uncomment this to turn on verbose mode. -+# Uncomment this to turn on verbose mode. - #export DH_VERBOSE=1 - - DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -@@ -163,7 +163,10 @@ - - install_dmsetup: export DH_OPTIONS = -pdmsetup - install_dmsetup: DIR = $(BUILD_DIR)/install_deb -+install_dmsetup: UDEVDIR = $(BUILD_DIR)/install_deb/lib/udev/rules.d - install_dmsetup: $(STAMPS_DIR)/install_deb -+ mv $(UDEVDIR)/10-dm.rules $(UDEVDIR)/55-dm.rules -+ mv $(UDEVDIR)/13-dm-disk.rules $(UDEVDIR)/60-persistent-storage-dm.rules - +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)' - +$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)" - -@@ -212,7 +215,9 @@ - - install_lvm2: export DH_OPTIONS = -plvm2 - install_lvm2: DIR = $(BUILD_DIR)/install_deb -+install_lvm2: UDEVDIR = $(BUILD_DIR)/install_deb/lib/udev/rules.d - install_lvm2: $(STAMPS_DIR)/install_deb -+ mv $(UDEVDIR)/11-dm-lvm.rules $(UDEVDIR)/56-lvm.rules - +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)' - dh_installinit --no-start -- start 26 S . - +$(MAKE_SELF) install-base -Index: LVM2.2.02.95/debian/lvm2.install -=================================================================== ---- LVM2.2.02.95.orig/debian/lvm2.install 2012-04-27 09:17:05.000000000 +0200 -+++ LVM2.2.02.95/debian/lvm2.install 2012-04-27 09:17:05.000000000 +0200 -@@ -1,4 +1,4 @@ --../../tree/lvm2/* / -+lib/udev/rules.d/56-lvm.rules - etc/lvm/lvm.conf - sbin/fsadm - sbin/lv* diff --git a/patchdir/jessie-remove-udebs.patch b/patchdir/jessie-remove-udebs.patch deleted file mode 100644 index b45d3e4..0000000 --- a/patchdir/jessie-remove-udebs.patch +++ /dev/null @@ -1,95 +0,0 @@ -Index: new/debian/control -=================================================================== ---- new.orig/debian/control -+++ new/debian/control -@@ -3,7 +3,7 @@ Section: admin - Priority: optional - Maintainer: Debian LVM Team - Uploaders: Bastian Blank --Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), dh-systemd, automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config -+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), dh-systemd, automake, libcorosync-pve-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config - Standards-Version: 3.9.5 - Homepage: http://sources.redhat.com/lvm2/ - Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/ -@@ -22,25 +22,11 @@ Description: Linux Logical Volume Manage - volume groups can be allocated to logical volumes, which are accessed as - regular block devices. - --Package: lvm2-udeb --Package-Type: udeb --Section: debian-installer --Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends} --Description: Linux Logical Volume Manager -- This is a udeb, or a microdeb, for the debian-installer. -- . -- This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM -- supports enterprise level volume management of disk and disk subsystems -- by grouping arbitrary disks into volume groups. The total capacity of -- volume groups can be allocated to logical volumes, which are accessed as -- regular block devices. -- - Package: clvm - Priority: extra - Architecture: any - Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base --Recommends: corosync | openais | cman -+Recommends: corosync-pve - Multi-Arch: foreign - Description: Cluster LVM Daemon for lvm2 - This package provides the clustering interface for lvm2, when used with -@@ -83,20 +69,6 @@ Description: Linux Kernel Device Mapper - device-mapper; it allows usage of the device-mapper through a clean, - consistent interface (as opposed to through kernel ioctls). - --Package: libdevmapper1.02.1-udeb --Package-Type: udeb --Section: debian-installer --Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends} --Description: Linux Kernel Device Mapper userspace library -- This is a udeb, or a microdeb, for the debian-installer. -- . -- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) -- Team's implementation of a minimalistic kernel-space driver that handles -- volume management, while keeping knowledge of the underlying device layout -- in user-space. This makes it useful for not only LVM, but EVMS, software -- raid, and other drivers that create "virtual" block devices. -- - Package: dmsetup - Architecture: any - Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>> 2.16) -@@ -105,20 +77,6 @@ Multi-Arch: foreign - Description: Linux Kernel Device Mapper userspace library - The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) - Team's implementation of a minimalistic kernel-space driver that handles -- volume management, while keeping knowledge of the underlying device layout -- in user-space. This makes it useful for not only LVM, but EVMS, software -- raid, and other drivers that create "virtual" block devices. -- . -- This package contains a utility for modifying device mappings. -- --Package: dmsetup-udeb --Package-Type: udeb --Section: debian-installer --Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends} --Description: Linux Kernel Device Mapper userspace library -- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) -- Team's implementation of a minimalistic kernel-space driver that handles - volume management, while keeping knowledge of the underlying device layout - in user-space. This makes it useful for not only LVM, but EVMS, software - raid, and other drivers that create "virtual" block devices. -Index: new/debian/rules -=================================================================== ---- new.orig/debian/rules -+++ new/debian/rules -@@ -258,7 +258,7 @@ install_lvm2-udeb: $(STAMPS_DIR)/install - +$(MAKE_SELF) install-base - - binary-indep: --binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm) -+binary-arch: $(addprefix install_,libdevmapper libdevmapper-event libdevmapper-dev dmsetup dmeventd liblvm2 lvm2 clvm) - - binary: binary-indep binary-arch - diff --git a/patchdir/remove-udebs.patch b/patchdir/remove-udebs.patch deleted file mode 100644 index 1712d21..0000000 --- a/patchdir/remove-udebs.patch +++ /dev/null @@ -1,98 +0,0 @@ -Index: new/debian/control -=================================================================== ---- new.orig/debian/control 2013-03-29 06:54:51.000000000 +0100 -+++ new/debian/control 2013-03-29 06:58:07.000000000 +0100 -@@ -21,20 +21,6 @@ - volume groups can be allocated to logical volumes, which are accessed as - regular block devices. - --Package: lvm2-udeb --XC-Package-Type: udeb --Section: debian-installer --Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends} --Description: Linux Logical Volume Manager -- This is a udeb, or a microdeb, for the debian-installer. -- . -- This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM -- supports enterprise level volume management of disk and disk subsystems -- by grouping arbitrary disks into volume groups. The total capacity of -- volume groups can be allocated to logical volumes, which are accessed as -- regular block devices. -- - Package: clvm - Priority: extra - Architecture: any -@@ -81,20 +67,6 @@ - device-mapper; it allows usage of the device-mapper through a clean, - consistent interface (as opposed to through kernel ioctls). - --Package: libdevmapper1.02.1-udeb --XC-Package-Type: udeb --Section: debian-installer --Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends} --Description: Linux Kernel Device Mapper userspace library -- This is a udeb, or a microdeb, for the debian-installer. -- . -- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) -- Team's implementation of a minimalistic kernel-space driver that handles -- volume management, while keeping knowledge of the underlying device layout -- in user-space. This makes it useful for not only LVM, but EVMS, software -- raid, and other drivers that create "virtual" block devices. -- - Package: dmsetup - Architecture: any - Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>> 2.16) -@@ -103,20 +75,6 @@ - Description: Linux Kernel Device Mapper userspace library - The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) - Team's implementation of a minimalistic kernel-space driver that handles -- volume management, while keeping knowledge of the underlying device layout -- in user-space. This makes it useful for not only LVM, but EVMS, software -- raid, and other drivers that create "virtual" block devices. -- . -- This package contains a utility for modifying device mappings. -- --Package: dmsetup-udeb --XC-Package-Type: udeb --Section: debian-installer --Architecture: any --Depends: ${shlibs:Depends}, ${misc:Depends} --Description: Linux Kernel Device Mapper userspace library -- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) -- Team's implementation of a minimalistic kernel-space driver that handles - volume management, while keeping knowledge of the underlying device layout - in user-space. This makes it useful for not only LVM, but EVMS, software - raid, and other drivers that create "virtual" block devices. -Index: new/debian/rules -=================================================================== ---- new.orig/debian/rules 2013-03-29 06:57:58.000000000 +0100 -+++ new/debian/rules 2013-03-29 06:58:07.000000000 +0100 -@@ -66,7 +66,7 @@ - cd $(DIR); autoreconf - touch $@ - --setup: $(STAMPS_DIR)/setup_deb $(STAMPS_DIR)/setup_udeb -+setup: $(STAMPS_DIR)/setup_deb - - $(STAMPS_DIR)/setup_deb: SOURCE_DIR = $(BUILD_DIR)/source - $(STAMPS_DIR)/setup_deb: DIR = $(BUILD_DIR)/build_deb -@@ -109,7 +109,7 @@ - touch $@ - - build: build-arch build-indep --build-arch: $(STAMPS_DIR)/build_deb $(STAMPS_DIR)/build_udeb -+build-arch: $(STAMPS_DIR)/build_deb - build-indep: - - build_deb: $(STAMPS_DIR)/build_deb -@@ -246,7 +246,7 @@ - +$(MAKE_SELF) install-base - - binary-indep: --binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm) -+binary-arch: $(addprefix install_,libdevmapper libdevmapper-event libdevmapper-dev dmsetup dmeventd liblvm2 lvm2 clvm) - - binary: binary-indep binary-arch - diff --git a/patchdir/series b/patchdir/series index e36a0ca..e6d1b8c 100644 --- a/patchdir/series +++ b/patchdir/series @@ -1,18 +1,2 @@ -##re-enable-clvm.patch -#fix-build-dependencies.patch -#fix-changelog.patch -##fix-fsadm-install.patch -#remove-udebs.patch -##autodetect-locking-type.patch -##suppress-error-messages.patch -##allow-new-symbols.patch -##fix-udev-rules.patch -#fix-clvm-init.patch -use-service-for-clvm.patch -fix-clvm-service-configuration-dir.patch -jessie-remove-udebs.patch -configure-with-corosync2.patch -fix-changelog.patch -fix-symbols.patch -filter_zvols_and_pve_vg_in_lvm.conf.patch -enable-issue-discard.patch +0001-filter-zvols-and-PVE-VG-by-default.patch +0002-enable-issue_discards-by-default.patch diff --git a/patchdir/suppress-error-messages.patch b/patchdir/suppress-error-messages.patch deleted file mode 100644 index 91eaac2..0000000 --- a/patchdir/suppress-error-messages.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: new/lib/locking/cluster_locking.c -=================================================================== ---- new.orig/lib/locking/cluster_locking.c 2011-09-21 10:08:21.000000000 +0200 -+++ new/lib/locking/cluster_locking.c 2011-09-21 10:10:55.000000000 +0200 -@@ -66,10 +66,14 @@ - { - int local_socket; - struct sockaddr_un sockaddr; -+ int suppress_messages = 0; -+ -+ if (ignorelockingfailure() && getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) -+ suppress_messages = 1; - - /* Open local socket */ - if ((local_socket = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { -- log_error("Local socket creation failed: %s", strerror(errno)); -+ log_error_suppress(suppress_messages, "Local socket creation failed: %s", strerror(errno)); - return -1; - } - -@@ -82,7 +86,7 @@ - sizeof(sockaddr))) { - int saved_errno = errno; - -- log_error("connect() failed on local socket: %s", -+ log_error_suppress(suppress_messages, "connect() failed on local socket: %s", - strerror(errno)); - if (close(local_socket)) - stack; diff --git a/patchdir/use-service-for-clvm.patch b/patchdir/use-service-for-clvm.patch deleted file mode 100644 index d190de2..0000000 --- a/patchdir/use-service-for-clvm.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: new/debian/rules -=================================================================== ---- new.orig/debian/rules -+++ new/debian/rules -@@ -171,7 +171,10 @@ install_clvm: export DH_OPTIONS = -pclvm - install_clvm: DIR = $(BUILD_DIR)/install_deb - install_clvm: $(STAMPS_DIR)/install_deb - +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)' -- dh_installinit --no-start -- start 63 S . start 51 0 6 . -+ # do not install clvm.init (we use lvm2-clvmd.service instead) -+ # do not install clvm.defaults (users should use systemd files to -+ # enable clvmd startup and overwrite settings) -+ dh_systemd_enable --no-enable lvm2-cluster-activation.service - +$(MAKE_SELF) install-base - - install_dmeventd: export DH_OPTIONS = -pdmeventd