Accepting request 342202 from network:ha-clustering:Factory

1

OBS-URL: https://build.opensuse.org/request/show/342202
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd-utils?expand=0&rev=4

drbd-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov  3 02:14:24 UTC 2015 - nwang@suse.com
+
+- BSC#949045. Remove execute of drbd.service.
+- Add patch service-mod.patch
+
 -------------------------------------------------------------------
 Wed Aug 19 09:00:49 UTC 2015 - nwang@suse.com
 

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

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)/