From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Mon, 2 Sep 2024 14:01:06 +0000 (-0400)
Subject: fix(systemd-sysctl): systemd-modules-load is not a dependency
X-Git-Tag: 104~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb6746085aaceed4822bf7c8ee13193e2ef46fe;p=thirdparty%2Fdracut-ng.git

fix(systemd-sysctl): systemd-modules-load is not a dependency

After= in systemd-sysctl.service does not imply dependency
on systemd-modules-load.
---

diff --git a/modules.d/01systemd-sysctl/module-setup.sh b/modules.d/01systemd-sysctl/module-setup.sh
index 64f93f9a4..d5abe575b 100755
--- a/modules.d/01systemd-sysctl/module-setup.sh
+++ b/modules.d/01systemd-sysctl/module-setup.sh
@@ -12,15 +12,6 @@ check() {
     return 255
 }
 
-# Module dependency requirements.
-depends() {
-
-    # This module has external dependency on other module(s).
-    echo systemd-modules-load
-    # Return 0 to include the dependent module(s) in the initramfs.
-    return 0
-}
-
 # Install the required file(s) for the module in the initramfs.
 install() {
 
diff --git a/modules.d/01systemd-udevd/module-setup.sh b/modules.d/01systemd-udevd/module-setup.sh
index 8d4a8b902..58ac83d77 100755
--- a/modules.d/01systemd-udevd/module-setup.sh
+++ b/modules.d/01systemd-udevd/module-setup.sh
@@ -4,7 +4,6 @@
 
 # Prerequisite check(s) for module.
 check() {
-
     # If the binary(s) requirements are not fulfilled the module can't be installed.
     require_binaries \
         udevadm \
@@ -13,22 +12,18 @@ check() {
 
     # Return 255 to only include the module, if another module requires it.
     return 255
-
 }
 
 # Module dependency requirements.
 depends() {
-
     # This module has external dependency on other module(s).
-    echo udev-rules systemd systemd-sysctl
+    echo udev-rules systemd systemd-sysctl systemd-modules-load
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
-
 }
 
 # Install the required file(s) and directories for the module in the initramfs.
 install() {
-
     inst_multiple -o \
         "$udevrulesdir"/99-systemd.rules \
         "$systemdutildir"/systemd-udevd \
@@ -72,5 +67,4 @@ install() {
     # Install required libraries.
     _arch=${DRACUT_ARCH:-$(uname -m)}
     inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libudev.so.*"
-
 }