Changeset 124f8507

Timestamp:

Mar 22, 2006, 12:48:17 PM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

4929f06

Parents:

c20d036

Message:

r2678@server: jim | 2006-03-22 12:40:49 -0800
Updated for use with Udev 088

Location:

udev

Files:

• udev (modified) (2 diffs)
• udev_retry (modified) (1 diff)

udev/udev

@@ -19 +19 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
-
-trigger_device_events() {
-        # generate events with the sysfs trigger
-        list=$(echo /sys/bus/*/devices/*/uevent)
-        list="$list $(echo /sys/class/*/*/uevent)"
-        list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
-        for i in $list; do
-            case "$i" in
-                */device/uevent|*\**)
-                    # skip followed device symlinks
-                    continue
-                    ;;
-
-                */class/mem/*|*/class/tty/*)
-                    first="$first $i"
-                    ;;
-
-                */block/md*)
-                    last="$last $i"
-                    ;;
-
-                */*)
-                    default="$default $i"
-                    ;;
-            esac
-        done
-
-        # trigger the sorted events
-        for i in $first $default $last; do
-            echo "add" > "$i"
-        done
-}
 
 case "$1" in
@@ -80 +48 @@
 
         # configure all devices
-        trigger_device_events
-
-        # until we know how to do better, just wait for _all_ events to finish
-        loop=300
-        while test -d /dev/.udev/queue; do
-            sleep 0.1;
-            test "$loop" -gt 0 || break
-            loop=$(($loop - 1))
-        done
-
-        echo_ok
+        /sbin/udevtrigger
+        evaluate_retval
         ;;
 
     stop)
         boot_mesg "Stopping udevd..."
-        echo "/sbin/hotplug" > /proc/sys/kernel/hotplug
         killproc /sbin/udevd
         ;;

udev/udev_retry

@@ -31 +31 @@
             done
         fi
-        evaluate_retval
+        loop=300
+        confirm=0
+        while true ; do
+            sleep 0.1
+            test -d /dev/.udev/queue && confirm=0 || confirm=$(( $confirm + 1 ))
+            loop=$(( $loop - 1 ))
+            test $loop -gt 0 || break
+            test $confirm -lt 10 || break
+        done
+        echo_ok
         ;;
     *)