Manually force early load of ehcd_hci to fix usb 2.0 detection.

diff --git a/config/rootfiles/core/34/filelists/mkinitcpio b/config/rootfiles/core/34/filelists/mkinitcpio
new file mode 120000 (symlink)
index 0000000..f9b3fde
--- /dev/null
+++ b/config/rootfiles/core/34/filelists/mkinitcpio
@@ -0,0 +1 @@
+../../../common/mkinitcpio
\ No newline at end of file

diff --git a/config/rootfiles/core/34/update.sh b/config/rootfiles/core/34/update.sh
index 7e9b8369459a05c8863f7d913d0afffa640ac048..31f36c4f24ec7064669a3410d1757a05e9caf2d3 100644 (file)
--- a/config/rootfiles/core/34/update.sh
+++ b/config/rootfiles/core/34/update.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2009 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
@@ -94,7 +94,7 @@ fi
 #
 echo
 echo Create new Initramdisks ...
-cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
 sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
 mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
 cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf

diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio
index c7dc4b60558a909861eb53e8af2f8187e893bff4..636589403d1e6a11df911b1371c7f17ac6da111c 100644 (file)
--- a/lfs/mkinitcpio
+++ b/lfs/mkinitcpio
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/
        sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
        sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf
-       sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf
+       sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf
        sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
 
        @rm -rf $(DIR_APP)

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 3e468d8e062b767e57f2e6970517dd3783b68abf..74f2974655de6f4cef989c5166584305609047c5 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -117,9 +117,9 @@ int main(int argc, char *argv[])
        mysystem("/sbin/modprobe ide-generic");
        mysystem("/sbin/modprobe ide-cd");
        mysystem("/sbin/modprobe ide-disk");
+       mysystem("/sbin/modprobe ehci-hcd");
        mysystem("/sbin/modprobe uhci-hcd");
        mysystem("/sbin/modprobe ohci-hcd");
-       mysystem("/sbin/modprobe ehci-hcd");
        mysystem("/sbin/modprobe ohci1394");
        mysystem("/sbin/modprobe sd_mod");
        mysystem("/sbin/modprobe sr_mod");