From 40e6900ae90aaeb02aa4c86dcad56ad3caf764dd Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 20:04:04 +0100 Subject: [PATCH] zfs-dkms: patch dracut module setup so that dracut won't fail if zfs module does not exist [release 2.1.12-2mamba;Thu Jun 08 2023] --- ....12-dracut-do-not-fail-if-module-is-missing.patch | 11 +++++++++++ zfs.spec | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 zfs-2.1.12-dracut-do-not-fail-if-module-is-missing.patch diff --git a/zfs-2.1.12-dracut-do-not-fail-if-module-is-missing.patch b/zfs-2.1.12-dracut-do-not-fail-if-module-is-missing.patch new file mode 100644 index 0000000..f12b747 --- /dev/null +++ b/zfs-2.1.12-dracut-do-not-fail-if-module-is-missing.patch @@ -0,0 +1,11 @@ +--- zfs-2.1.12/contrib/dracut/90zfs/module-setup.sh.in.orig 2023-06-08 09:49:01.694185811 +0200 ++++ zfs-2.1.12/contrib/dracut/90zfs/module-setup.sh.in 2023-06-08 09:49:13.223120806 +0200 +@@ -19,7 +19,7 @@ + } + + installkernel() { +- instmods -c zfs ++ instmods zfs + } + + install() { diff --git a/zfs.spec b/zfs.spec index 82d6b82..7b2e2cd 100644 --- a/zfs.spec +++ b/zfs.spec @@ -1,6 +1,6 @@ Name: zfs -Version: 2.1.11 -Release: 1mamba +Version: 2.1.12 +Release: 2mamba Summary: An advanced file system and volume manager Group: System/Tools Vendor: openmamba @@ -9,6 +9,7 @@ Packager: Silvan Calarco URL: https://zfsonlinux.org Source: https://github.com/zfsonlinux/zfs.git/zfs-%{version}/zfs-%{version}.tar.bz2 Patch0: zfs-2.1.6-only-build-the-module-in-dkms.conf.patch +Patch1: zfs-2.1.12-dracut-do-not-fail-if-module-is-missing.patch License: Common Development and Distribution License ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -71,6 +72,7 @@ This package contains the Python libraries for %{name}. %prep %setup -q %patch 0 -p1 -b .only-build-the-module-in-dkms.conf +%patch 1 -p1 #-D -T #:<< _EOF ./autogen.sh @@ -263,6 +265,12 @@ fi %{python3_sitelib}/pyzfs-*-py*.egg-info/* %changelog +* Thu Jun 08 2023 Silvan Calarco 2.1.12-2mamba +- zfs-dkms: patch dracut module setup so that dracut won't fail if zfs module does not exist + +* Wed Jun 07 2023 Automatic Build System 2.1.12-1mamba +- automatic version update by autodist + * Sat Apr 22 2023 Automatic Build System 2.1.11-1mamba - automatic version update by autodist