diff -Nru lvm2-2.02.167/debian/changelog lvm2-2.02.167/debian/changelog --- lvm2-2.02.167/debian/changelog 2017-05-04 02:14:00.000000000 +0200 +++ lvm2-2.02.167/debian/changelog 2017-05-07 19:04:06.000000000 +0200 @@ -1,3 +1,10 @@ +lvm2 (2.02.167-1ubuntu7) artful; urgency=medium + + * Do not start lvm2-monitor in containers (LP: #1576341) + * Refresh fix-strips-limit.patch + + -- Balint Reczey Sun, 07 May 2017 00:54:40 +0200 + lvm2 (2.02.167-1ubuntu6) artful; urgency=medium * Drop: diff -Nru lvm2-2.02.167/debian/patches/0012-no-lvm2-monitor-in-containers.patch lvm2-2.02.167/debian/patches/0012-no-lvm2-monitor-in-containers.patch --- lvm2-2.02.167/debian/patches/0012-no-lvm2-monitor-in-containers.patch 1970-01-01 01:00:00.000000000 +0100 +++ lvm2-2.02.167/debian/patches/0012-no-lvm2-monitor-in-containers.patch 2017-05-07 00:53:48.000000000 +0200 @@ -0,0 +1,17 @@ +Description: Do not start lvmetad in containers +Author: Balint Reczey +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lvm2/+bug/1576341 +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- lvm2-2.02.167.orig/scripts/lvm2_monitoring_systemd_red_hat.service.in ++++ lvm2-2.02.167/scripts/lvm2_monitoring_systemd_red_hat.service.in +@@ -6,6 +6,7 @@ After=dm-event.socket dm-event.service l + Before=local-fs-pre.target + DefaultDependencies=no + Conflicts=shutdown.target ++ConditionVirtualization=!container + + [Service] + Type=oneshot diff -Nru lvm2-2.02.167/debian/patches/fix-strips-limit.patch lvm2-2.02.167/debian/patches/fix-strips-limit.patch --- lvm2-2.02.167/debian/patches/fix-strips-limit.patch 2017-03-27 10:33:46.000000000 +0200 +++ lvm2-2.02.167/debian/patches/fix-strips-limit.patch 2017-05-07 00:16:12.000000000 +0200 @@ -17,11 +17,9 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1675770 Last-Update: 2017-03-27 -diff --git a/tools/lvcreate.c b/tools/lvcreate.c -index cd31c99..ed56757 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c -@@ -558,8 +558,10 @@ static int _read_mirror_and_raid_params(struct cmd_context *cmd, +@@ -559,8 +559,10 @@ else if (seg_is_any_raid6(lp)) max_images -= 2; } diff -Nru lvm2-2.02.167/debian/patches/series lvm2-2.02.167/debian/patches/series --- lvm2-2.02.167/debian/patches/series 2017-03-27 10:25:30.000000000 +0200 +++ lvm2-2.02.167/debian/patches/series 2017-05-07 00:31:14.000000000 +0200 @@ -13,3 +13,4 @@ enable-issue-discards.patch 0011-fix-lvmetad-32bit.patch fix-strips-limit.patch +0012-no-lvm2-monitor-in-containers.patch