From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Tue, 20 Apr 2021 15:05:53 +0000 (+0000)
Subject: fix(systemd-modules): remove dependency on systemd meta module
X-Git-Tag: 054~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afef455718db69cff3797ca1a6d8bfebd2e86ab3;p=thirdparty%2Fdracut.git

fix(systemd-modules): remove dependency on systemd meta module

Depending on systemd meta module causes circular dependency,
prevents the existance of multiple systemd based meta modules
and is redunant.
---

diff --git a/modules.d/01systemd-ask-password/module-setup.sh b/modules.d/01systemd-ask-password/module-setup.sh
index dc89b221a..228cadbb1 100755
--- a/modules.d/01systemd-ask-password/module-setup.sh
+++ b/modules.d/01systemd-ask-password/module-setup.sh
@@ -17,9 +17,7 @@ check() {
 # Module dependency requirements.
 depends() {
 
-    # This module has external dependency on the systemd module.
-    echo systemd
-    # Return 0 to include the dependent systemd module in the initramfs.
+    # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 
 }
diff --git a/modules.d/01systemd-coredump/module-setup.sh b/modules.d/01systemd-coredump/module-setup.sh
index 5b8b75ac8..c6b8be879 100755
--- a/modules.d/01systemd-coredump/module-setup.sh
+++ b/modules.d/01systemd-coredump/module-setup.sh
@@ -18,8 +18,8 @@ check() {
 depends() {
 
     # This module has external dependency on the systemd module.
-    echo systemd systemd-journald systemd-sysctl
-    # Return 0 to include the dependent systemd module in the initramfs.
+    echo systemd-journald systemd-sysctl
+    # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 
 }
diff --git a/modules.d/01systemd-repart/module-setup.sh b/modules.d/01systemd-repart/module-setup.sh
index dc6061960..fc5c5acb1 100755
--- a/modules.d/01systemd-repart/module-setup.sh
+++ b/modules.d/01systemd-repart/module-setup.sh
@@ -16,9 +16,7 @@ check() {
 # Module dependency requirements.
 depends() {
 
-    # This module has external dependency on the systemd module.
-    echo systemd
-    # Return 0 to include the dependent systemd module in the initramfs.
+    # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 
 }
diff --git a/modules.d/01systemd-sysctl/module-setup.sh b/modules.d/01systemd-sysctl/module-setup.sh
index f12ce8e5d..cc4fae6d9 100755
--- a/modules.d/01systemd-sysctl/module-setup.sh
+++ b/modules.d/01systemd-sysctl/module-setup.sh
@@ -17,7 +17,7 @@ check() {
 depends() {
 
     # This module has external dependency on other module(s).
-    echo systemd systemd-modules-load
+    echo systemd-modules-load
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 
diff --git a/modules.d/01systemd-sysusers/module-setup.sh b/modules.d/01systemd-sysusers/module-setup.sh
index 485be86ed..f0924dfaf 100644
--- a/modules.d/01systemd-sysusers/module-setup.sh
+++ b/modules.d/01systemd-sysusers/module-setup.sh
@@ -17,9 +17,7 @@ check() {
 # Module dependency requirements.
 depends() {
 
-    # This module has external dependency on the systemd module.
-    echo systemd
-    # Return 0 to include the dependent systemd module in the initramfs.
+    # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 
 }