diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-10-06 15:35:49 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-10-06 15:35:49 +0000 |
| commit | 2a1c1e03a43156b673a7188a0cd4a784829ab3c5 (patch) | |
| tree | 44836a7635dccafd4c8bac9fbb7234d059b1d52b /bootscripts | |
| parent | b777a9ed50efe38706c26e9e4bae3e1efb67d24f (diff) | |
Fix the udev_retry script, and add an explanation
for how to configure it.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9614 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/ChangeLog | 9 | ||||
| -rw-r--r-- | bootscripts/Makefile | 3 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/udev_retry | 11 |
3 files changed, 20 insertions, 3 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index fb3cc3138..1937ca4b0 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,4 +1,11 @@ -2100-09-18 +2011-10-06 Bryan Kadzban <bryan@linuxfromscratch.org> + + * Add configuration for udev_retry, and remove --type=failed (which does + not work with recent udev versions anyway, since no events can possibly + trigger it). Start with just the "rtc" subsystem. BLFS should eventually + add "sound" to this file, and perhaps others. + +2011-09-18 * Review and update of changes made in previous change. ** Rename /etc/sysconfig/init_params to /etc/sysconfig/rc.site. ** Move network services to /lib/services. diff --git a/bootscripts/Makefile b/bootscripts/Makefile index 5053e2698..65eafc888 100644 --- a/bootscripts/Makefile +++ b/bootscripts/Makefile @@ -60,6 +60,9 @@ files: create-dirs if [ ! -f ${EXTDIR}/sysconfig/modules ]; then \ install -m ${CONFMODE} lfs/sysconfig/modules ${EXTDIR}/sysconfig/ ;\ fi + if [ ! -f ${EXTDIR}/sysconfig/udev_retry ]; then \ + install -m ${CONFMODE} lfs/sysconfig/udev_retry ${EXTDIR}/sysconfig/ ;\ + fi if [ ! -f ${EXTDIR}/sysconfig/rc ]; then \ install -m ${CONFMODE} lfs/sysconfig/rc ${EXTDIR}/sysconfig/ ;\ fi diff --git a/bootscripts/lfs/init.d/udev_retry b/bootscripts/lfs/init.d/udev_retry index 8abf3da64..4f258ac19 100644 --- a/bootscripts/lfs/init.d/udev_retry +++ b/bootscripts/lfs/init.d/udev_retry @@ -7,6 +7,7 @@ # Authors : Alexander E. Patrakov # DJ Lucas - dj@linuxfromscratch.org # Update : Bruce Dubbs - bdubbs@linuxfromscratch.org +# Bryan Kadzban - # # Version : LFS 7.0 # @@ -44,8 +45,14 @@ case "${1}" in rm -f $file done - # Re-trigger the failed uevents in hope they will succeed now - /sbin/udevadm trigger --type=failed --action=add + # Re-trigger the uevents that may have failed, + # in hope they will succeed now + /bin/sed -e 's/#.*$//' /etc/sysconfig/udev_retry | /bin/grep -v '^$' | \ + while read line ; do + for subsystem in $line ; do + /sbin/udevadm trigger --subsystem-match=$subsystem --action=add + done + done # Now wait for udevd to process the uevents we triggered /sbin/udevadm settle |