From 98b5cc933bf940ece2985729689cd523a580b998 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 8 Jan 2010 02:05:00 +0100 Subject: [PATCH] Manually force early load of ehcd_hci to fix usb 2.0 detection. --- config/rootfiles/core/34/filelists/mkinitcpio | 1 + config/rootfiles/core/34/update.sh | 4 ++-- lfs/mkinitcpio | 2 +- src/install+setup/install/main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 120000 config/rootfiles/core/34/filelists/mkinitcpio diff --git a/config/rootfiles/core/34/filelists/mkinitcpio b/config/rootfiles/core/34/filelists/mkinitcpio new file mode 120000 index 0000000000..f9b3fde253 --- /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 7e9b836945..31f36c4f24 100644 --- 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 . # +# Copyright (C) 2010 IPFire-Team . # # # ############################################################################ # @@ -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 c7dc4b6055..636589403d 100644 --- 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 3e468d8e06..74f2974655 100644 --- 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"); -- 2.39.2