Changeset 1729 in MondoRescue

Timestamp:

Oct 29, 2007, 3:46:39 AM (16 years ago)

Author:

Bruno Cornec

Message:

Still trying to activate USB correctly at boot time with udev

Location:

branches/2.2.5/mindi

Files:

• mindi (modified) (1 diff)
• rootfs/sbin/init (modified) (1 diff)
• rootfs/sbin/start-nfs (modified) (2 diffs)
• rootfs/sbin/start-usb (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -2864 +2864 @@
                 i=`echo $i | sed 's/.gz//'`
         fi
-        (cd $mountpoint ; ln -s $i . 2>/dev/null) || LogIt "Unable to link `basename $i` to $mountpoint"
+        (cd $mountpoint ; ln -s $i . 2>/dev/null)
         [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done

branches/2.2.5/mindi/rootfs/sbin/init

@@ -496 +496 @@
 fi
 
+if [ -f /proc/modules ]; then
+    echo "/sbin/modprobe" > /proc/sys/kernel/modprobe
+fi
+
 if [ -e "/tmp/USE-UDEV" ] ; then
     RunUdevd

branches/2.2.5/mindi/rootfs/sbin/start-nfs

@@ -49 +49 @@
 if [ $? -eq 0 ]; then
     ipdev=`echo $ipconf | cut -d: -f1`
-    echo "Making DHCP request on $ipdev"
+    LogIt "Making DHCP request on $ipdev"
     udhcpc -i $ipdev
 else
@@ -59 +59 @@
         ipgateway=`echo $ipconf | cut -d: -f5`
     fi
-    echo "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
+    LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
     ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
     route add default gw $ipgateway

branches/2.2.5/mindi/rootfs/sbin/start-usb

@@ -20 +20 @@
 fi
 
-LogIt "Mounting USB device ($usbdev) on /mnt/cdrom..."
+needusbstorage=`LC_ALL=C grep -e "^I.*Cls=08" /proc/bus/usb/devices 2>/dev/null`
+unamer=`uname -r`
+min=`echo $unamer | cut -d. -f2`
+[ -n "$needusbstorage" -a "$min" = "4" ] && /sbin/modprobe usb-storage >/dev/null 2>&1
+
+[ -d /proc/bus/usb ] && ! grep -q /proc/bus/usb /proc/mounts && mount -t usbfs none /proc/bus/usb
+
+LogIt "Mounting USB device (${usbdev}1) on /mnt/cdrom..."
+sync
+sleep 2
+ls -l ${usbdev}1
 mount -t vfat ${usbdev}1 /mnt/cdrom
+/sbin/modprobe usb-storage
+sleep 10
+ls -l ${usbdev}1
+mount -t vfat ${usbdev}1 /mnt/cdrom