From 48d1d4efb588d955e42a7ce7fe0f25ffe3c424a3624f93ee4395c990ab0739c2 Mon Sep 17 00:00:00 2001 From: nick wang Date: Tue, 3 Nov 2015 02:23:05 +0000 Subject: [PATCH] Accepting request 342198 from home:wanghaisu:branches:network:ha-clustering:Factory BSC#949045. Remove execute of drbd.service. OBS-URL: https://build.opensuse.org/request/show/342198 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=13 --- drbd-utils.changes | 5 +++++ drbd-utils.spec | 2 ++ service-mod.patch | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 service-mod.patch diff --git a/drbd-utils.changes b/drbd-utils.changes index 7b8ebcd..185689c 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 02:14:24 UTC 2015 - nwang@suse.com + +- BSC#949045. Remove execute of drbd.service. + ------------------------------------------------------------------- Wed Aug 19 09:00:49 UTC 2015 - nwang@suse.com diff --git a/drbd-utils.spec b/drbd-utils.spec index 530ea6d..5fe977e 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -29,6 +29,7 @@ Source: http://oss.linbit.com/drbd/%{name}-%{version}.tar.gz Patch1: init-script-fixes.diff Patch2: fix-libdir-in-Makefile.patch Patch3: zeroout-discard-devices.patch +Patch4: service-mod.patch Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -73,6 +74,7 @@ raid 1. It is a building block for setting up clusters. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build ./autogen.sh diff --git a/service-mod.patch b/service-mod.patch new file mode 100644 index 0000000..ead2df5 --- /dev/null +++ b/service-mod.patch @@ -0,0 +1,13 @@ +Index: drbd-utils-8.9.2/scripts/Makefile.in +=================================================================== +--- drbd-utils-8.9.2.orig/scripts/Makefile.in ++++ drbd-utils-8.9.2/scripts/Makefile.in +@@ -65,7 +65,7 @@ endif + # yes, debian apparently allows installing both types from the same package + ifneq ($(initscripttype),sysv) # "systemd" or "both" + install -d $(DESTDIR)$(systemdunitdir) +- install -m 755 drbd.service $(DESTDIR)$(systemdunitdir)/ ++ install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ + install -d $(DESTDIR)/lib/drbd/ + install -m 755 drbd $(DESTDIR)/lib/drbd/ + install -d $(DESTDIR)$(tmpfilesdir)/