# HG changeset patch # User Pascal Bellard # Date 1216808390 0 # Node ID d6f7d8765539d82f39cf60a589fda3f6b5395caf # Parent 10d28491bea51396291488a0d282f853bab428b8 rcS: fix config= for usb diff -r 10d28491bea5 -r d6f7d8765539 etc/init.d/rcS --- a/etc/init.d/rcS Tue Jul 22 22:25:02 2008 +0000 +++ b/etc/init.d/rcS Wed Jul 23 10:19:50 2008 +0000 @@ -98,8 +98,20 @@ CONFIG=`cat /proc/cmdline | sed 's/.* config=\([^ ]*\).*/\1/'` DEVICE=${CONFIG%,*} SCRIPT=${CONFIG#*,} + echo "Probing $DEVICE... " + if ! /bin/mount -r $DEVICE /mnt; then + if echo $DEVICE | grep -q "/dev/sd"; then + USBDELAY=`cat /sys/module/usb_storage/parameters/delay_use` + USBDELAY=$((1+$USBDELAY)) + echo "$DEVICE is potentially a USB device: sleep for $USBDELAY seconds" + sleep $USBDELAY + fi + if ! /bin/mount -r $DEVICE /mnt; then + CONFIG="" + fi + fi echo -n "Source $SCRIPT from $DEVICE... " - if /bin/mount -r $DEVICE /mnt; then + if [ -n "$CONFIG" ]; then . /mnt/$SCRIPT /bin/umount /mnt fi