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 dc89b221a5bc3c3c140455c0341dd52cc8cac41d..228cadbb1f54f7a6981dba711839dcec8eafb56a 100755 (executable)
--- 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 5b8b75ac8b0483884db22c9a9af6d180283fcb4c..c6b8be879491d73bbf6a31ef24418d5e2cfc5ca4 100755 (executable)
--- 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 dc606196074759fb9d53121603b1b2d06b261956..fc5c5acb1468a2606e303ef45190d3e3ce3fde2d 100755 (executable)
--- 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 f12ce8e5d875603e219430e5a68f97bac55c0eb1..cc4fae6d940c3da136417709795fbc33e0330503 100755 (executable)
--- 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 485be86ed86edbf01c05f9022de617ff752da73c..f0924dfaf717650ef64879413eef05a47daa94dc 100644 (file)
--- 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
 
 }