r1312 - / trunk/udev

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Mar 22 14:26:09 PST 2006


Author: jim
Date: 2006-03-22 15:26:08 -0700 (Wed, 22 Mar 2006)
New Revision: 1312

Removed:
   trunk/udev/udev_retry
Modified:
   /
   trunk/udev/
   trunk/udev/Makefile
Log:
 r2690 at server (orig r1312):  jim | 2006-03-22 14:21:38 -0800
  r2681 at server:  jim | 2006-03-22 12:53:41 -0800
  Removed udev_retry, handled by udevtrigger now
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1311
   + b6734a72-470d-0410-b049-f317dca95413:/:1312


Property changes on: trunk/udev
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/udev:2678
3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1263
   + 38c7b366-470d-0410-a457-935707c16d9b:/udev:2681
3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1263

Modified: trunk/udev/Makefile
===================================================================
--- trunk/udev/Makefile	2006-03-22 22:26:00 UTC (rev 1311)
+++ trunk/udev/Makefile	2006-03-22 22:26:08 UTC (rev 1312)
@@ -35,10 +35,8 @@
 	install -d ${DESTDIR}/etc/rc.d/rcsysinit.d
 	install -d ${DESTDIR}/etc/rc.d/init.d
 	install -m ${INITMODE} udev ${DESTDIR}/etc/rc.d/init.d/udev
-	install -m ${INITMODE} udev_retry ${DESTDIR}/etc/rc.d/init.d/udev_retry
 	install -m ${SCRIPTMODE} show_event_log ${DESTDIR}/usr/share/udev/show_event_log
 	ln -sf ../init.d/udev ${DESTDIR}/etc/rc.d/rcsysinit.d/S10udev
-	ln -sf ../init.d/udev_retry ${DESTDIR}/etc/rc.d/rcsysinit.d/S45udev_retry
 
 device_dirs:
 	install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices

Deleted: trunk/udev/udev_retry
===================================================================
--- trunk/udev/udev_retry	2006-03-22 22:26:00 UTC (rev 1311)
+++ trunk/udev/udev_retry	2006-03-22 22:26:08 UTC (rev 1312)
@@ -1,48 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/udev_retry
-#
-# Description : Udev Retry Boot Script
-#
-# Authors     : Based on Open Suse Udev Rules
-#               kay.sievers at suse.de
-#
-# Adapted to  : Jim Gifford
-# LFS
-#
-# Version     : 00.00
-#
-# Notes       : Retry Udev events that have failed after local file
-#               systems are mounted
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "$1" in
-    start)
-	if test -d /dev/.udev/failed; then
-	    boot_mesg "Retry device configuration..."
-	    list=$(echo /dev/.udev/failed/*)
-	    for i in $list; do
-		device="$(readlink $i)/uevent"
-		test -e $device && echo "add" > $device
-	    done
-	fi
-	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
-	;;
-    *)
-	echo "Usage: $0 {start}"
-	exit 1
-	;;
-esac




More information about the cross-lfs mailing list