diff --git a/_servicedata b/_servicedata index 15d02a2..60ea76d 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/suse-module-tools.git - 46ad91a426a9b7152a885cc9f3431f069ccda712 \ No newline at end of file + 9b3340f3d7bd08f5112811f78bbd00834e5758bf \ No newline at end of file diff --git a/suse-module-tools-16.0.36.obscpio b/suse-module-tools-16.0.36.obscpio deleted file mode 100644 index 209bcf6..0000000 --- a/suse-module-tools-16.0.36.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35c2cfc44db3524a1005cedfc877f6635f914fc7798d7437c6ca7a51a4b15818 -size 123403 diff --git a/suse-module-tools-16.0.37.obscpio b/suse-module-tools-16.0.37.obscpio new file mode 100644 index 0000000..430a51f --- /dev/null +++ b/suse-module-tools-16.0.37.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0611d4f37876cba7a79755d92683a1e8ece19cd1fa66f31c19463b0812526095 +size 126987 diff --git a/suse-module-tools.changes b/suse-module-tools.changes index 177be4b..cb4b79d 100644 --- a/suse-module-tools.changes +++ b/suse-module-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 25 19:48:57 UTC 2023 - Martin Wilck + + * weak-modules2: ignore INITRD_MODULES (jsc#PED-1915), obtain + list of modules from dracut.conf.d instead + ------------------------------------------------------------------- Fri Sep 29 16:49:41 UTC 2023 - Martin Wilck diff --git a/suse-module-tools.obsinfo b/suse-module-tools.obsinfo index 7d5d908..66e34e6 100644 --- a/suse-module-tools.obsinfo +++ b/suse-module-tools.obsinfo @@ -1,4 +1,4 @@ name: suse-module-tools -version: 16.0.36 -mtime: 1696002424 -commit: 46ad91a426a9b7152a885cc9f3431f069ccda712 +version: 16.0.37 +mtime: 1698263242 +commit: 9b3340f3d7bd08f5112811f78bbd00834e5758bf diff --git a/suse-module-tools.spec b/suse-module-tools.spec index 459a348..0a9002b 100644 --- a/suse-module-tools.spec +++ b/suse-module-tools.spec @@ -36,7 +36,7 @@ %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g') Name: suse-module-tools -Version: 16.0.36 +Version: 16.0.37 Release: 0 Summary: Configuration for module loading and SUSE-specific utilities for KMPs License: GPL-2.0-or-later @@ -112,7 +112,7 @@ install -pm 644 "depmod-00-system.conf" "%{buildroot}%{depmod_dir}/00-system.con # "/usr/lib/module-init-tools" name hardcoded in other packages install -d -m 755 "%{buildroot}/usr/lib/module-init-tools" install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \ - weak-modules2 driver-check.sh unblacklist lsinitrd-quick + weak-modules2 driver-check.sh unblacklist lsinitrd-quick get_dracut_drivers install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/" install -d -m 755 "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" install -pm 755 "kernel-scriptlets/cert-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets" @@ -226,6 +226,7 @@ exit 0 /usr/lib/module-init-tools/lsinitrd-quick /usr/lib/module-init-tools/unblacklist /usr/lib/module-init-tools/weak-modules2 +/usr/lib/module-init-tools/get_dracut_drivers %{_unitdir}/*.service %{_unitdir}/systemd-sysctl.service.d %{_modulesloaddir}