Add patch for multipath/udev issue. (#723357, <bmarzins@redhat.com>)

This commit is contained in:
Bill Nottingham 2011-07-22 13:41:15 -04:00
parent 4c3a9506dd
commit 067b5ca6da
2 changed files with 18 additions and 1 deletions

View File

@ -8,7 +8,7 @@ Version: 9.31
# ppp-watch is GPLv2+, everything else is GPLv2 # ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+ License: GPLv2 and GPLv2+
Group: System Environment/Base Group: System Environment/Base
Release: 1%{?dist} Release: 2%{?dist}
URL: http://fedorahosted.org/releases/i/n/initscripts/ URL: http://fedorahosted.org/releases/i/n/initscripts/
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -60,6 +60,7 @@ Requires(pre): /usr/sbin/groupadd
Requires(post): /sbin/chkconfig, coreutils Requires(post): /sbin/chkconfig, coreutils
Requires(preun): /sbin/chkconfig Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig
Patch0: multipath-nosync.patch
%description %description
The initscripts package contains the basic system scripts used to boot The initscripts package contains the basic system scripts used to boot
@ -89,6 +90,7 @@ Currently, this consists of various memory checking code.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
make make
@ -314,6 +316,9 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug* /etc/profile.d/debug*
%changelog %changelog
* Fri Jul 22 2011 Bill Nottingham <notting@redhat.com> - 9.31-2
- work around multipath/udev incompatibility (#723357, <bmarzins@redhat.com>)
* Tue Jun 21 2011 Bill Nottingham <notting@redhat.com> - 9.31-1 * Tue Jun 21 2011 Bill Nottingham <notting@redhat.com> - 9.31-1
- remove ifup/ifdown-ipsec; they're now in ipsec-tools - remove ifup/ifdown-ipsec; they're now in ipsec-tools
- rc.sysinit: start udev by hand, start_udev is no more (#714531) - rc.sysinit: start udev by hand, start_udev is no more (#714531)

12
multipath-nosync.patch Normal file
View File

@ -0,0 +1,12 @@
diff -urpN initscripts-9.31/systemd/fedora-storage-init initscripts-9.31-patched/systemd/fedora-storage-init
--- initscripts-9.31/systemd/fedora-storage-init 2011-06-21 14:41:29.000000000 -0500
+++ initscripts-9.31-patched/systemd/fedora-storage-init 2011-07-19 11:44:30.421998951 -0500
@@ -9,7 +9,7 @@
if ! strstr "$cmdline" nompath && [ -f /etc/multipath.conf ] && \
[ -x /sbin/multipath ]; then
modprobe dm-multipath > /dev/null 2>&1
- /sbin/multipath -v 0
+ /sbin/multipath -n -v 0
if [ -x /sbin/kpartx ]; then
/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null
fi