From 37972bc1fd1639e2c5fc055f6fd93a4ed7ee1b2a73a50903db63e33b91dc7b1a Mon Sep 17 00:00:00 2001 From: nick wang Date: Tue, 23 Feb 2016 05:07:26 +0000 Subject: [PATCH 1/2] Accepting request 361038 from home:wanghaisu:branches:network:ha-clustering:Factory Check file exist before mv. OBS-URL: https://build.opensuse.org/request/show/361038 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=18 --- drbd-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drbd-utils.spec b/drbd-utils.spec index e82ab31..962ee91 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -1,7 +1,7 @@ # # spec file for package drbd-utils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -109,7 +109,10 @@ rm -rf %{buildroot}%{_sysconfdir}/xen %endif mkdir -p %{buildroot}/usr/lib/udev/rules.d +if [ -f "%{buildroot}/lib/udev/rules.d/65-drbd.rules" ] +then mv %{buildroot}/lib/udev/rules.d/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drbd.rules +fi %pre %service_add_pre drbd.service From cc9f1e0e59a52611c6bcf9612ac04c211629c593dfd5f4d3d56c4ec1cb4ccf40 Mon Sep 17 00:00:00 2001 From: nick wang Date: Tue, 23 Feb 2016 05:29:54 +0000 Subject: [PATCH 2/2] Accepting request 361040 from home:wanghaisu:branches:network:ha-clustering:Factory Fix bsc#967753 - different define of udevrulesdir in make with changelog modified. OBS-URL: https://build.opensuse.org/request/show/361040 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=19 --- drbd-utils.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drbd-utils.changes b/drbd-utils.changes index db035a2..c39f876 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 23 05:19:07 UTC 2016 - nwang@suse.com + +- bsc#967753. Fix different udev rules folder in Leap and openSUSE. + ------------------------------------------------------------------- Thu Dec 24 06:17:48 UTC 2015 - nwang@suse.com