commit: 4ae738435b78927204e0ece15476ae5966d4b244 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Sep 12 21:32:09 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Sep 12 21:32:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae73843
sys-fs/multipath-tools: replace sed with a patch Package-Manager: portage-2.3.0_p24 ...path-tools-0.6.2-ignore-modprobe-failures.patch | 25 ++++++++++++++++++++++ .../multipath-tools-0.6.2-r2.ebuild | 3 +-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch new file mode 100644 index 00000000..cb78589 --- /dev/null +++ b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch @@ -0,0 +1,25 @@ +From 100588046ad59176b9779c73212aea63be5aace4 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Mon, 12 Sep 2016 17:26:38 -0400 +Subject: [PATCH] multipathd.service: ignore modprobe failures + +--- + multipathd/multipathd.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service +index e3d6f91..d26577f 100644 +--- a/multipathd/multipathd.service ++++ b/multipathd/multipathd.service +@@ -11,7 +11,7 @@ Conflicts=shutdown.target + Type=notify + NotifyAccess=main + LimitCORE=infinity +-ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath ++ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath + ExecStart=/sbin/multipathd -d -s + ExecReload=/sbin/multipathd reconfigure + +-- +2.10.0 + diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild index 4d9b9af..5f0ffa7 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild @@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-${COMMIT_ID:0:7}" PATCHES=( "${FILESDIR}"/${PN}-0.6.2-makefile.patch + "${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch ) get_systemd_pv() { @@ -56,8 +57,6 @@ src_install() { newinitd "${FILESDIR}"/rc-multipathd multipathd newinitd "${FILESDIR}"/multipath.rc multipath - sed -i 's|ExecStartPre=/|ExecStartPre=-/|g' "${D}"/usr/lib/systemd/system/multipathd.service || die - dodoc README ChangeLog }
