Adding upstream version 102.upstream/102

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 16 deletions

diff --git a/modules.d/01systemd-udevd/module-setup.sh b/modules.d/01systemd-udevd/module-setup.sh
index ce5d2a3..168167f 100755
--- a/modules.d/01systemd-udevd/module-setup.sh
+++ b/modules.d/01systemd-udevd/module-setup.sh
@@ -20,7 +20,7 @@ check() {
 depends() {
 
     # This module has external dependency on other module(s).
-    echo systemd
+    echo udev-rules systemd systemd-sysctl
     # Return 0 to include the dependent module(s) in the initramfs.
     return 0
 
@@ -30,20 +30,14 @@ depends() {
 install() {
 
     inst_multiple -o \
+        /etc/udev/udev.hwdb \
         "$udevdir"/hwdb.bin \
-        "$udevdir"/udev.conf \
-        "$udevdir"/ata_id \
-        "$udevdir"/cdrom_id \
         "$udevdir"/dmi_memory_id \
         "$udevdir"/fido_id \
         "$udevdir"/mtd_probe \
         "$udevdir"/mtp-probe \
-        "$udevdir"/scsi_id \
         "$udevdir"/v4l_id \
-        "$udevrulesdir"/50-udev-default.rules \
         "$udevrulesdir"/60-autosuspend.rules \
-        "$udevrulesdir"/60-block.rules \
-        "$udevrulesdir"/60-cdrom_id.rules \
         "$udevrulesdir"/60-drm.rules \
         "$udevrulesdir"/60-evdev.rules \
         "$udevrulesdir"/60-fido-id.rules \
@@ -51,20 +45,15 @@ install() {
         "$udevrulesdir"/60-persistent-alsa.rules \
         "$udevrulesdir"/60-persistent-input.rules \
         "$udevrulesdir"/60-persistent-storage-tape.rules \
-        "$udevrulesdir"/60-persistent-storage.rules \
         "$udevrulesdir"/60-persistent-v4l.rules \
         "$udevrulesdir"/60-sensor.rules \
         "$udevrulesdir"/60-serial.rules \
-        "$udevrulesdir"/64-btrfs.rules \
         "$udevrulesdir"/70-joystick.rules \
         "$udevrulesdir"/70-memory.rules \
         "$udevrulesdir"/70-mouse.rules \
         "$udevrulesdir"/70-touchpad.rules \
-        "$udevrulesdir"/75-net-description.rules \
         "$udevrulesdir"/75-probe_mtd.rules \
         "$udevrulesdir"/78-sound-card.rules \
-        "$udevrulesdir"/80-drivers.rules \
-        "$udevrulesdir"/80-net-setup-link.rules \
         "$udevrulesdir"/81-net-dhcp.rules \
         "$udevrulesdir"/99-systemd.rules \
         "$systemdutildir"/systemd-udevd \
@@ -79,14 +68,12 @@ install() {
         "$systemdsystemunitdir"/sockets.target.wants/systemd-udevd-control.socket \
         "$systemdsystemunitdir"/sockets.target.wants/systemd-udevd-kernel.socket \
         "$systemdsystemunitdir"/sysinit.target.wants/systemd-udevd.service \
-        "$systemdsystemunitdir"/sysinit.target.wants/systemd-udev-trigger.service \
-        udevadm
+        "$systemdsystemunitdir"/sysinit.target.wants/systemd-udev-trigger.service
 
     # Install the hosts local user configurations if enabled.
     if [[ $hostonly ]]; then
         inst_multiple -H -o \
             "$udevconfdir"/hwdb.bin \
-            "$udevconfdir"/udev.conf \
             "$udevrulesconfdir/*.rules" \
             "$systemdutilconfdir"/hwdb/hwdb.bin \
             "$systemdsystemconfdir"/systemd-udevd.service \