Adding upstream version 102.upstream/102

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

1 files changed, 7 insertions, 11 deletions

diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index 3ca12ee..e5b7f97 100755
--- 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
@@ -33,7 +31,6 @@ install() {
         59-scsi-sg3_utils.rules \
         60-block.rules \
         60-cdrom_id.rules \
-        60-pcmcia.rules \
         60-persistent-storage.rules \
         64-btrfs.rules \
         70-uaccess.rules \
@@ -45,9 +42,6 @@ install() {
         "$moddir/59-persistent-storage.rules" \
         "$moddir/61-persistent-storage.rules"
 
-    # legacy persistent network device name rules
-    [[ $hostonly ]] && inst_rules 70-persistent-net.rules
-
     {
         for i in cdrom tape dialout floppy; do
             if ! grep -q "^$i:" "$initdir"/etc/group 2> /dev/null; then
@@ -72,12 +66,14 @@ install() {
         "${udevdir}"/path_id \
         "${udevdir}"/input_id \
         "${udevdir}"/scsi_id \
-        "${udevdir}"/usb_id \
-        "${udevdir}"/pcmcia-socket-startup \
-        "${udevdir}"/pcmcia-check-broken-cis
-
-    inst_multiple -o /etc/pcmcia/config.opts
+        "${udevdir}"/usb_id
 
     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
 }