fix(base): install /etc/udev/udev.conf in hostonly mode only

Remove duplicated rule from systemd-udevd.

diff --git a/modules.d/01systemd-udevd/module-setup.sh b/modules.d/01systemd-udevd/module-setup.sh
index 30a7b0aa970df3ba9f0e36e2a38802f10e6a9bf0..168167f29faf9b5a2661cf8172bd00a7eb195ddb 100755 (executable)
--- a/modules.d/01systemd-udevd/module-setup.sh
+++ b/modules.d/01systemd-udevd/module-setup.sh
@@ -73,9 +73,7 @@ install() {
     # Install the hosts local user configurations if enabled.
     if [[ $hostonly ]]; then
         inst_multiple -H -o \
-            /etc/udev/udev.conf \
             "$udevconfdir"/hwdb.bin \
-            "$udevconfdir"/udev.conf \
             "$udevrulesconfdir/*.rules" \
             "$systemdutilconfdir"/hwdb/hwdb.bin \
             "$systemdsystemconfdir"/systemd-udevd.service \

diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index c68d88fbf70ae9ef3a4904d6120f352b63e4145d..479cb90f1b1a3ddc8e1803308e8bca12f0ed68f2 100755 (executable)
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -8,8 +8,6 @@ install() {
     # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
     # of the rules we want so that we just copy those in would be best
     inst_multiple udevadm cat uname blkid
-    inst_dir /etc/udev
-    inst_multiple -o /etc/udev/udev.conf
 
     [[ -d ${initdir}/$systemdutildir ]] || mkdir -p "${initdir}/$systemdutildir"
     for _i in "${systemdutildir}"/systemd-udevd "${udevdir}"/udevd /sbin/udevd; do
@@ -77,4 +75,10 @@ install() {
 
     inst_libdir_file "libnss_files*"
 
+    # Install the hosts local user configurations if enabled.
+    if [[ $hostonly ]]; then
+        inst_dir /etc/udev
+        inst_multiple -H -o \
+            /etc/udev/udev.conf
+    fi
 }