From 8c753ecd11f113b374fbdb873041ee908b3bcfdd Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Wed, 7 Jun 2006 08:32:27 +0000 Subject: [PATCH] Benjamin Schieder: substitute manual udev coldstart with udevtrigger/udevsettle in bootdisk, initscript [2006051813232317653] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7609 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/sysfiles/etc_initscript.txt | 10 ++-------- target/bootdisk/linuxrc.sh | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/package/base/sysfiles/etc_initscript.txt b/package/base/sysfiles/etc_initscript.txt index 2eee0b3dc..fbc0ff211 100644 --- a/package/base/sysfiles/etc_initscript.txt +++ b/package/base/sysfiles/etc_initscript.txt @@ -59,14 +59,8 @@ case "$devtype" in echo "" > /proc/sys/kernel/hotplug /sbin/udevd --daemon # create nodes for devices already in kernel - find /sys -name uevent | while read uevent; do - echo 1 > $uevent - done - udevwait=0 - while [ -d /dev/.udev/queue -a $udevwait -lt 300 ] ; do - sleep 1 - (( udevwait++ )) - done + /sbin/udevtrigger + /sbin/udevsettle exec > /dev/console 2>&1 < /dev/console echo "Mounted /dev (udev) from /etc/initscript." fi diff --git a/target/bootdisk/linuxrc.sh b/target/bootdisk/linuxrc.sh index 29fe0a782..6c8073426 100644 --- a/target/bootdisk/linuxrc.sh +++ b/target/bootdisk/linuxrc.sh @@ -399,14 +399,8 @@ checkisomd5() { # {{{ } # }}} 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 } # }}} input=1