patchdir/0003-disable-use-lvmetad.patch

   1 From 09e094641e59ca3ef8f1de45f47a15c07e421e1a Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
   3 Date: Mon, 9 Oct 2017 12:34:14 +0200
   4 Subject: [PATCH 3/6] disable-use-lvmetad
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826570
  10
  11 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  12 ---
  13  debian/lvm2.postinst | 15 +++++++++++++++
  14  debian/rules         |  3 ++-
  15  2 files changed, 17 insertions(+), 1 deletion(-)
  16
  17 diff --git a/debian/lvm2.postinst b/debian/lvm2.postinst
  18 index 563162c..d62d30b 100644
  19 --- a/debian/lvm2.postinst
  20 +++ b/debian/lvm2.postinst
  21 @@ -15,6 +15,21 @@ case "$1" in
  22              deb-systemd-helper purge lvm2-activation-early.service lvm2-activation.service >/dev/null
  23              deb-systemd-helper unmask lvm2-activation-early.service lvm2-activation.service >/dev/null
  24          fi
  25 +
  26 +        # disable unless lvm config says otherwise
  27 +        use_lvmetad="$(lvmconfig global/use_lvmetad)"
  28 +        if [ "$use_lvmetad" = "use_lvmetad=0" ]; then
  29 +            echo "Masking and stopping lvmetad service units, '$use_lvmetad' is set"
  30 +            systemctl mask lvm2-lvmetad.service
  31 +            systemctl stop lvm2-lvmetad.service
  32 +            systemctl mask lvm2-lvmetad.socket
  33 +            systemctl stop lvm2-lvmetad.socket
  34 +        else
  35 +            echo "Unmasking and starting lvmetad service units, '$use_lvmetad' is set"
  36 +            systemctl unmask lvm2-lvmetad.service
  37 +            systemctl unmask lvm2-lvmetad.socket
  38 +            systemctl start lvm2-lvmetad.socket
  39 +        fi
  40      ;;
  41  esac
  42
  43 diff --git a/debian/rules b/debian/rules
  44 index f4e16c4..eaafe6c 100755
  45 --- a/debian/rules
  46 +++ b/debian/rules
  47 @@ -92,6 +92,7 @@ $(STAMPS_DIR)/setup_deb: $(STAMPS_DIR)/source
  48                 --enable-cmirrord \
  49                 --enable-dmeventd \
  50                 --enable-lvmetad \
  51 +               --disable-use-lvmetad \
  52                 --enable-lvmpolld \
  53                 --enable-pkgconfig \
  54                 --enable-readline \
  55 @@ -280,9 +281,9 @@ install_lvm2: $(STAMPS_DIR)/install_deb install_libdevmapper install_liblvm2
  56         dh_installinit --restart-after-upgrade --name lvm2-lvmpolld
  57         dh_systemd_enable \
  58                 lvm2-monitor.service \
  59 -               lvm2-lvmetad.socket \
  60                 lvm2-lvmpolld.socket
  61         dh_systemd_enable --no-enable \
  62 +               lvm2-lvmetad.socket \
  63                 lvm2-lvmetad.service \
  64                 lvm2-lvmpolld.service
  65         dh_systemd_start --restart-after-upgrade \
  66 --
  67 2.14.1
  68