diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-02 10:32:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-02 10:32:03 +0000 |
| commit | 7475c99fc8561e533539b7e510293c488c6b2e7c (patch) | |
| tree | e858854dccd7618cc54b5bd5655dccc2713b821b | |
| parent | bff231dfc87b311497db96874a4ba4350c6b40fb (diff) | |
sys-kernel/zfs-dkms : backport fix for https://github.com/zfsonlinux/zfs/issues/9417
| -rw-r--r-- | sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch | 12 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/zfs-dkms-0.8.2-r1.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-0.8.2.ebuild) | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch b/sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch new file mode 100644 index 00000000..ad612d26 --- /dev/null +++ b/sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch @@ -0,0 +1,12 @@ +diff -Nur a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c +--- a/module/zfs/vdev_disk.c 2019-09-25 21:44:42.626286618 +0100 ++++ b/module/zfs/vdev_disk.c 2020-01-02 10:29:56.356741395 +0000 +@@ -220,7 +220,7 @@ + char *envp[] = { NULL }; + + argv[2] = kmem_asprintf(SET_SCHEDULER_CMD, device, elevator); +- error = call_usermodehelper(argv[0], argv, envp, UMH_NO_WAIT); ++ error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); + strfree(argv[2]); + #endif /* HAVE_ELEVATOR_CHANGE */ + if (error) { diff --git a/sys-kernel/zfs-dkms/zfs-dkms-0.8.2.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-0.8.2-r1.ebuild index fdfb5728..a4ee98ab 100644 --- a/sys-kernel/zfs-dkms/zfs-dkms-0.8.2.ebuild +++ b/sys-kernel/zfs-dkms/zfs-dkms-0.8.2-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=7 inherit eutils @@ -22,9 +22,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" -src_prepare() { - : -} +PATCHES=( "${FILESDIR}"/Use_NMH_WAIT_EXEC_with_call.patch ) src_configure() { : |