SHA256
1
0
forked from pool/systemd

Accepting request 1134609 from home:dimstar:Factory

- udev(-mini)?: ensure %_modulesloaddir exists and is owned
  properly. Allows other packages to install modules without worry
  of the parent directory. We do not ensure /etc/modules-load.d
  exists in the -mini flavor, as that directory is not meant to be
  used by packages.

OBS-URL: https://build.opensuse.org/request/show/1134609
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1481
This commit is contained in:
Franck Bui 2023-12-22 10:27:31 +00:00 committed by Git OBS Bridge
parent a52c2fed3d
commit c2a4199985
3 changed files with 15 additions and 0 deletions

View File

@ -4,7 +4,9 @@
%config(noreplace) %{_sysconfdir}/udev/udev.conf
%if %{without bootstrap}
%dir %{_libdir}/cryptsetup
%endif
%dir %{_modulesloaddir}
%if %{without bootstrap}
%dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d
%endif

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Dec 21 10:11:53 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- udev(-mini)?: ensure %_modulesloaddir exists and is owned
properly. Allows other packages to install modules without worry
of the parent directory. We do not ensure /etc/modules-load.d
exists in the -mini flavor, as that directory is not meant to be
used by packages.
-------------------------------------------------------------------
Wed Dec 20 12:49:09 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -862,6 +862,10 @@ mkdir -p %{buildroot}%{_modprobedir}
mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/
%endif
# Make sure /usr/lib/modules-load.d exists in udev(-mini)?, so other
# packages can install modules without worry
mkdir -p %{buildroot}%{_modulesloaddir}
# Make sure we don't ship static enablement symlinks in /etc during
# installation, presets should be honoured instead.
rm -rf %{buildroot}%{_sysconfdir}/systemd/system/*.target.{requires,wants}