From 64439de549e2a5f54fcecf5a47d652f1cc81c82a Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Mon, 15 May 2006 08:40:45 +0000 Subject: [PATCH] Benjamin Schieder: udev 090 has a semi-sane way of starting again. Use it in rockinitrd. [2006050708485389050] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7587 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/rockinitrd/init | 10 ++-------- package/base/rockinitrd/initrd_base.txt | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/package/base/rockinitrd/init b/package/base/rockinitrd/init index 0cd3aea96..60f739266 100644 --- a/package/base/rockinitrd/init +++ b/package/base/rockinitrd/init @@ -36,14 +36,8 @@ initrd_mount() { # {{{ } # }}} emit_udev_events() { # {{{ - while read uevent; do - echo 1 > $uevent - done < <( find /sys -name uevent ) - udevwait=0 - while [ -d /dev/.udev/queue -a $udevwait -lt 300 ] ; do - sleep 1 - (( udevwait++ )) - done + /sbin/udevtrigger + /sbin/udevsettle } # }}} PATH="/sbin:/usr/sbin:/bin/:/usr/bin" diff --git a/package/base/rockinitrd/initrd_base.txt b/package/base/rockinitrd/initrd_base.txt index cdf7221a9..6a7fc31da 100644 --- a/package/base/rockinitrd/initrd_base.txt +++ b/package/base/rockinitrd/initrd_base.txt @@ -12,8 +12,8 @@ /bin/grep /bin/grep /bin/gawk /bin/awk /bin/sleep /bin/sleep -/sbin/udev /sbin/udev -/sbin/udevsend /sbin/udevsend +/sbin/udevtrigger /sbin/udevtrigger +/sbin/udevsettle /sbin/udevsettle /sbin/udevd /sbin/udevd /etc/udev /etc/udev /lib/udev /lib/udev