remove patch fix-drbd-path-in-systemd-service.patch

diff --git a/debian/patches/fix-drbd-path-in-systemd-service.patch b/debian/patches/fix-drbd-path-in-systemd-service.patch
deleted file mode 100644 (file)
index 04632e8..0000000
--- a/debian/patches/fix-drbd-path-in-systemd-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: new/scripts/drbd.service
-===================================================================
---- new.orig/scripts/drbd.service
-+++ new/scripts/drbd.service
-@@ -7,11 +7,11 @@ After=network.target sshd.service
- Type=oneshot
- RemainAfterExit=yes
- 
--ExecStart=/lib/drbd/drbd start
--ExecStop=/lib/drbd/drbd stop
-+ExecStart=/usr/lib/drbd/drbd start
-+ExecStop=/usr/lib/drbd/drbd stop
- 
- # Re-adjust everything on reload
--ExecReload=/lib/drbd/drbd reload
-+ExecReload=/usr/lib/drbd/drbd reload
- 
- [Install]
- WantedBy=multi-user.target

diff --git a/debian/patches/series b/debian/patches/series
index 85f50a228ea2a03901ee7fef43dd2e9e319f793f..3e7491dffb7c06ab3d067d62169fedd82491fea9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix-drbd-path-in-systemd-service.patch
 enable-two-primaries.patch
 fix-drbd-service-mode.patch

diff --git a/debian/rules b/debian/rules
index 0e0b78747df19b97bf36e5e7cb17ae5fd1eeb8d0..0a5e7487ee61d99485b199d210a5c7af83fe8c05 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,11 +31,8 @@ override_dh_auto_configure:
 override_dh_auto_install:
        dh_auto_install --destdir debian/drbd-utils
 
-override_dh_install:
-       dh_install --fail-missing
-
 override_dh_systemd_enable:
-       dh_systemd_enable --no-enable drbd.service
+       dh_systemd_enable -p drbd-utils --no-enable drbd.service
 
 override_dh_gencontrol:
        dh_gencontrol -Ndrbd8-utils