use systemd service for clvm

diff --git a/patchdir/fix-clvm-service-configuration-dir.patch b/patchdir/fix-clvm-service-configuration-dir.patch
new file mode 100644 (file)
index 0000000..9bf33f4
--- /dev/null
+++ b/patchdir/fix-clvm-service-configuration-dir.patch
@@ -0,0 +1,28 @@
+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/series b/patchdir/series
index 235c4bedf153c9572652926a13e30a9edc301ccc..a532d193423a9baa751c135e68f72be400498191 100644 (file)
--- a/patchdir/series
+++ b/patchdir/series
@@ -9,6 +9,8 @@
 ##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

diff --git a/patchdir/use-service-for-clvm.patch b/patchdir/use-service-for-clvm.patch
new file mode 100644 (file)
index 0000000..d190de2
--- /dev/null
+++ b/patchdir/use-service-for-clvm.patch
@@ -0,0 +1,16 @@
+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