Attachment 316160 Details for Bug 460762 – upstream's patch for usb booting

[patch] upstream's patch for usb booting

mkinitrd-6.0.62-usb_boot.patch (text/plain), 2.03 KB, created by Michal Hlavinka on 2008-09-09 08:56:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Hlavinka

Created: 2008-09-09 08:56:07 UTC

Size: 2.03 KB

patch

obsolete

>diff -up mkinitrd-6.0.62/mkinitrd.usb_boot mkinitrd-6.0.62/mkinitrd
>--- mkinitrd-6.0.62/mkinitrd.usb_boot	2008-08-11 18:14:54.000000000 +0200
>+++ mkinitrd-6.0.62/mkinitrd	2008-08-11 21:30:45.000000000 +0200
>@@ -1373,7 +1373,9 @@ emitmodules() {
>         shift
>     done
> 
>+    found_hcd_module="no"
>     usb_mounted="prep"
>+    wait_for_scsi="no"
>     for MODULE in $(eval echo \${$modlist}) ; do
>         text=""
>         module=`echo $MODULE | sed -e "s|.*/||" -e "s/\.k\?o$//"`
>@@ -1391,6 +1393,7 @@ emitmodules() {
>         if [ "$usb_mounted" == "prep" ]; then
>             if [[ "$module" =~ ".hci[_-]hcd" ]]; then
>                 usb_mounted="no"
>+                found_hcd_module="yes"
>             fi
>         elif [ "$usb_mounted" == "no" ]; then
>             if [[ ! "$module" =~ ".hci[_-]hcd" ]]; then
>@@ -1409,6 +1412,10 @@ emitmodules() {
>         # Hack - we need a delay after loading usb-storage to give things
>         #        time to settle down before we start looking a block devices
>         if [ "$module" = "usb-storage" -o "$module" = "ub" ]; then
>+            if [ "$found_hcd_module" == "no" -a "$usb_mounted" == "prep" ]; then
>+                usb_mounted=yes
>+                emit "mount -t usbfs /proc/bus/usb /proc/bus/usb"
>+            fi
>             emit "echo Waiting for driver initialization."
>             emit "stabilized /proc/bus/usb/devices"
>         fi
>@@ -1440,11 +1447,16 @@ EOF
>             done
>         fi
>         if [ "${module::5}" == "pata_" -o "$module" == "ata_piix" -o "$module" == "ahci" -o "${module::5}" == "sata_" -o "$module" == "ibmvscsic" ]; then
>-            emit "echo Waiting for driver initialization."
>-            emit "stabilized --hash --interval 250 /proc/scsi/scsi"
>+            wait_for_scsi="yes"
>         fi
>     done
>+    if [ "$wait_for_scsi" == "yes" ]; then
>+        emit "echo Waiting for driver initialization."
>+        emit "stabilized --hash --interval 250 /proc/scsi/scsi"
>+    fi
>     unset usb_mounted
>+    unset found_hcd_module
>+    unset wait_for_scsi
> }
> 
> if [ $ncryptodevs -ne 0 ]; then

Actions: View | Diff

Attachments on bug 460762: 316076 | 316160