fix(dbus, network-manager): make generic mode host independent

Files under /etc on the host are considered host specific.
Do not include them in the generic initramfs.

As an example "$dbussystemconfdir"/teamd.conf points to
/etc/dbus-1/system.d/teamd.conf - which should be only included
in hostonly initramfs.

diff --git a/modules.d/16dbus-broker/module-setup.sh b/modules.d/16dbus-broker/module-setup.sh
index e28bd21b164406edd5296ad03c0b1dbadc01566a..13c0c19c88d691a135fc20737e1e6b0f3cb6bd75 100755 (executable)
--- a/modules.d/16dbus-broker/module-setup.sh
+++ b/modules.d/16dbus-broker/module-setup.sh
@@ -34,12 +34,6 @@ install() {
     inst_dir "$dbussession"
     inst_dir "$dbussystem"
     inst_dir "$dbussystemservices"
-    inst_dir "$dbusconfdir"
-    inst_dir "$dbusinterfacesconfdir"
-    inst_dir "$dbusservicesconfdir"
-    inst_dir "$dbussessionconfdir"
-    inst_dir "$dbussystemconfdir"
-    inst_dir "$dbussystemservicesconfdir"
 
     inst_sysusers dbus.conf
 
@@ -47,7 +41,6 @@ install() {
         "$dbus"/session.conf \
         "$dbus"/system.conf \
         "$dbussystem"/org.freedesktop.systemd1.conf \
-        "$dbusservicesconfdir"/org.freedesktop.systemd1.service \
         "$dbussystemservices"/org.freedesktop.systemd1.service \
         "$systemdcatalog"/dbus-broker.catalog \
         "$systemdcatalog"/dbus-broker-launch.catalog \
@@ -72,6 +65,12 @@ install() {
 
     # Install the hosts local user configurations if enabled.
     if [[ $hostonly ]]; then
+        inst_dir "$dbusconfdir"
+        inst_dir "$dbusinterfacesconfdir"
+        inst_dir "$dbusservicesconfdir"
+        inst_dir "$dbussessionconfdir"
+        inst_dir "$dbussystemconfdir"
+        inst_dir "$dbussystemservicesconfdir"
         inst_multiple -H -o \
             "$dbusconfdir"/session.conf \
             "$dbusconfdir"/system.conf \
@@ -79,6 +78,7 @@ install() {
             "$systemdsystemconfdir"/dbus.socket.d/*.conf \
             "$systemdsystemconfdir"/dbus-broker.service \
             "$systemdsystemconfdir"/dbus-broker.service.d/*.conf \
+            "$dbusservicesconfdir"/org.freedesktop.systemd1.service \
             "$systemdsystemconfdir"/sockets.target.wants/dbus.socket
     fi
 

diff --git a/modules.d/16dbus-daemon/module-setup.sh b/modules.d/16dbus-daemon/module-setup.sh
index 5972b0b2d0e63774a04093e5409e0d29b8fa6ff1..b64ca96dea68be177d126b6330b50d450a2181c5 100755 (executable)
--- a/modules.d/16dbus-daemon/module-setup.sh
+++ b/modules.d/16dbus-daemon/module-setup.sh
@@ -38,17 +38,10 @@ install() {
     inst_dir "$dbussession"
     inst_dir "$dbussystem"
     inst_dir "$dbussystemservices"
-    inst_dir "$dbusconfdir"
-    inst_dir "$dbusinterfacesconfdir"
-    inst_dir "$dbusservicesconfdir"
-    inst_dir "$dbussessionconfdir"
-    inst_dir "$dbussystemconfdir"
-    inst_dir "$dbussystemservicesconfdir"
 
     inst_multiple -o \
         "$dbus"/system.conf \
         "$dbussystem"/org.freedesktop.systemd1.conf \
-        "$dbusservicesconfdir"/org.freedesktop.systemd1.service \
         "$dbussystemservices"/org.freedesktop.systemd1.service \
         "$systemdsystemunitdir"/dbus.service \
         "$systemdsystemunitdir"/dbus.socket \
@@ -78,8 +71,15 @@ install() {
 
     # Install the hosts local user configurations if enabled.
     if [[ $hostonly ]]; then
+        inst_dir "$dbusconfdir"
+        inst_dir "$dbusinterfacesconfdir"
+        inst_dir "$dbusservicesconfdir"
+        inst_dir "$dbussessionconfdir"
+        inst_dir "$dbussystemconfdir"
+        inst_dir "$dbussystemservicesconfdir"
         inst_multiple -H -o \
             "$dbusconfdir"/system.conf \
+            "$dbusservicesconfdir"/org.freedesktop.systemd1.service \
             "$systemdsystemconfdir"/dbus.socket \
             "$systemdsystemconfdir"/dbus.socket.d/*.conf \
             "$systemdsystemconfdir"/dbus.service \

diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
index 638b17b0b7c86af86ffb8b3992a1051d6970e0c2..6ba03c450841550d2d910c04ae4c04e8e51805de 100755 (executable)
--- a/modules.d/35network-manager/module-setup.sh
+++ b/modules.d/35network-manager/module-setup.sh
@@ -44,8 +44,12 @@ install() {
 
         # teaming support under systemd+dbus
         inst_multiple -o \
-            "$dbussystem"/teamd.conf \
-            "$dbussystemconfdir"/teamd.conf
+            "$dbussystem"/teamd.conf
+
+        if [[ $hostonly ]]; then
+            inst_multiple -H -o \
+                "$dbussystemconfdir"/teamd.conf
+        fi
 
         # Install a configuration snippet to prevent the automatic creation of
         # "Wired connection #" DHCP connections for Ethernet interfaces