fix(systemd): make dbus optional dependency

Remove dbus as a mandatory dependency for the following
dracut modules
 - systemd-hostnamed
 - systemd-portabled
 - systemd-resolved
 - systemd-timedated
 - systemd-timesyncd

Users and distributions can still include dbus dracut module in the
initramfs as before, but now dbus dracut module is required to
be explicitly added in the dracut configuration.

The motivation of this change is to allow users and distributions
to exclude dbus from the initramfs.

diff --git a/modules.d/11systemd-hostnamed/module-setup.sh b/modules.d/11systemd-hostnamed/module-setup.sh
index d589061741bc76e23241c4f04f35585e7bf988fc..401d248da62ae264fc084a96bf6eb8fb5926c1c6 100755 (executable)
--- a/modules.d/11systemd-hostnamed/module-setup.sh
+++ b/modules.d/11systemd-hostnamed/module-setup.sh
@@ -20,7 +20,7 @@ check() {
 depends() {
 
     # This module has external dependency on other module(s).
-    echo dbus systemd-sysusers
+    echo systemd-sysusers
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 

diff --git a/modules.d/11systemd-portabled/module-setup.sh b/modules.d/11systemd-portabled/module-setup.sh
index 05ab50636b7794233c55e466a57983c118adce61..85ed6adeab49cec4850cc8eaa336a2ee51511d0f 100755 (executable)
--- a/modules.d/11systemd-portabled/module-setup.sh
+++ b/modules.d/11systemd-portabled/module-setup.sh
@@ -19,8 +19,6 @@ check() {
 # Module dependency requirements.
 depends() {
 
-    # This module has external dependency on other module(s).
-    echo dbus
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 

diff --git a/modules.d/11systemd-resolved/module-setup.sh b/modules.d/11systemd-resolved/module-setup.sh
index d20f211c60742508c57fd8a2f4f2826e0675db2d..51e960cbe16ee37db64d504f8327b307a069d3f4 100755 (executable)
--- a/modules.d/11systemd-resolved/module-setup.sh
+++ b/modules.d/11systemd-resolved/module-setup.sh
@@ -20,7 +20,7 @@ check() {
 depends() {
 
     # This module has external dependency on other module(s).
-    echo dbus systemd-sysusers
+    echo systemd-sysusers
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 

diff --git a/modules.d/11systemd-timedated/module-setup.sh b/modules.d/11systemd-timedated/module-setup.sh
index 5e9c5caf9a072cd2dec0edb5da9d0af365927109..245240238e0ea19f2eee2e469b5d1ceeccfead61 100755 (executable)
--- a/modules.d/11systemd-timedated/module-setup.sh
+++ b/modules.d/11systemd-timedated/module-setup.sh
@@ -19,8 +19,6 @@ check() {
 # Module dependency requirements.
 depends() {
 
-    # This module has external dependency on other module(s).
-    echo dbus
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 

diff --git a/modules.d/11systemd-timesyncd/module-setup.sh b/modules.d/11systemd-timesyncd/module-setup.sh
index 82902b3b05828b6c22a71f0311ffdf1b9d109d8f..aecd6bfd7b963480e56ecbfc8b9a71a3d8faa112 100755 (executable)
--- a/modules.d/11systemd-timesyncd/module-setup.sh
+++ b/modules.d/11systemd-timesyncd/module-setup.sh
@@ -20,7 +20,7 @@ check() {
 depends() {
 
     # This module has external dependency on other module(s).
-    echo dbus systemd-sysusers systemd-timedated
+    echo systemd-sysusers systemd-timedated
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0