[lvm2/f15] Add workaround for monitoring initcript stop (systemd sysv incompatibility).
Milan Broz
mbroz at fedoraproject.org
Tue Sep 20 15:56:20 UTC 2011
commit 2856049a12d9e717f59ba87f68f8d0616010d5a2
Author: Milan Broz <mbroz at fedoraproject.org>
Date: Tue Sep 20 17:55:17 2011 +0200
Add workaround for monitoring initcript stop (systemd sysv incompatibility).
lvm2-f15-reload.patch | 19 +++++++++++++++++++
lvm2.spec | 7 ++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/lvm2-f15-reload.patch b/lvm2-f15-reload.patch
new file mode 100644
index 0000000..9fb38ef
--- /dev/null
+++ b/lvm2-f15-reload.patch
@@ -0,0 +1,19 @@
+--- LVM2.2.02.84.old/scripts/lvm2_monitoring_init_red_hat.in 2010-04-15 21:15:04.000000000 +0200
++++ LVM2.2.02.84/scripts/lvm2_monitoring_init_red_hat.in 2011-09-20 17:27:57.151286007 +0200
+@@ -91,8 +91,14 @@ case "$1" in
+ ;;
+
+ stop)
+- test "$runlevel" = "0" && WARN=0
+- test "$runlevel" = "6" && WARN=0
++#
++# Because systemd doesn't support setting of $runlevel
++# https://bugzilla.redhat.com/show_bug.cgi?id=728955
++# we have to use workaround here.
++#
++# test "$runlevel" = "0" && WARN=0
++# test "$runlevel" = "6" && WARN=0
++ WARN=0
+ stop
+ rtrn=$?
+ [ $rtrn = 0 ] && rm -f $LOCK_FILE
diff --git a/lvm2.spec b/lvm2.spec
index 0ec6cf1..ba17522 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -39,7 +39,7 @@
Summary: Userland logical volume management tools
Name: lvm2
Version: 2.02.84
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://sources.redhat.com/lvm2
@@ -49,6 +49,7 @@ Source1: %{name}-tmpfiles.conf
%endif
Patch0: lvm2-set-default-preferred_names.patch
Patch1: lvm2-uname.patch
+Patch2: lvm2-f15-reload.patch
BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
BuildRequires: ncurses-devel
@@ -83,6 +84,7 @@ or more physical volumes and creating one or more logical volumes
%setup -q -n LVM2.%{version}
%patch0 -p1 -b preferred_names
%patch1 -p1 -b .uname
+%patch2 -p1 -b .init
%build
%define _exec_prefix ""
@@ -494,6 +496,9 @@ the device-mapper event library.
%changelog
+* Tue Sep 20 2011 Milan Broz <mbroz at redhat.com> - 2.02.84-4
+- Add workaround for monitoring initcript stop (systemd sysv incompatibility).
+
* Wed Jun 22 2011 Zdenek Kabelac <zkabelac at redhat.com> - 2.02.84-3
- Updated uname string test.
More information about the scm-commits
mailing list