From: Dietmar Maurer Date: Tue, 9 Jun 2015 09:01:54 +0000 (+0200) Subject: remove patch fix-drbd-path-in-systemd-service.patch X-Git-Url: https://git.proxmox.com/?p=drbd-utils.git;a=commitdiff_plain;h=271c423594ae68a9ac9f99138d1c6ac75a35d65a;hp=096ca34960e1d9e69b51e031d3051a489071b5b3 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 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 85f50a2..3e7491d 100644 --- 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 0e0b787..0a5e748 100755 --- 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