From c2a41999854eb737c81aca48bea5393fbceca3d293cc86f047a237c730e91779 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Fri, 22 Dec 2023 10:27:31 +0000
Subject: [PATCH] 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
---
 files.udev      | 2 ++
 systemd.changes | 9 +++++++++
 systemd.spec    | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/files.udev b/files.udev
index c32bbb71..1f8a39cf 100644
--- a/files.udev
+++ b/files.udev
@@ -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
diff --git a/systemd.changes b/systemd.changes
index 3280cf7d..d0b5fe54 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -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>
 
diff --git a/systemd.spec b/systemd.spec
index efdc4ba1..07e641b9 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -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}