Disabled ub driver

add rootdelay to grub because usbstorage need more
time to setup the devices
This commit is contained in:
Arne Fitzenreiter
2008-07-01 19:30:03 +02:00
parent 0a99422f80
commit 9e70f7de8b
4 changed files with 13 additions and 13 deletions

View File

@@ -6,41 +6,41 @@ background = ffffff
splashimage (hd0,0)/grub/ipfire.xpm.gz
title IPFire
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER.img
savedefault 0
title IPFire (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER.img
savedefault 1
title IPFire (acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 acpi=off MOUNT
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER.img
savedefault 2
title IPFire (vesafb 1024x768, acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 acpi=off MOUNT
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
initrd /ipfirerd-KVER.img
savedefault 3
title IPFire SMP/HT
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 MOUNT
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 4
title IPFire SMP/HT (vesafb 1024x768)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 vga=791 MOUNT
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 5
title IPFire SMP/HT (acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 acpi=off MOUNT
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 6
title IPFire SMP/HT (vesafb 1024x768, acpi=off)
root (hd0,0)
kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 vga=791 acpi=off MOUNT
kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
initrd /ipfirerd-KVER-smp.img
savedefault 7

View File

@@ -920,7 +920,7 @@ CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_UB=m
# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192

View File

@@ -920,7 +920,7 @@ CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_UB=m
# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192

View File

@@ -79,10 +79,10 @@ $(TARGET) :
depmod -a -F /boot/System.map-$(KVER)-ipfire \
-b /install/initrd $(KVER)-ipfire
# Change priority of pata and ub module
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep "# \|ata\| ub" \
# Change priority of pata module
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep "# \|ata" \
modules.alias > modules.alias.tmp
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep -v "# \|ata\| ub" \
cd /install/initrd/lib/modules/$(KVER)-ipfire && grep -v "# \|ata" \
modules.alias >> modules.alias.tmp
cd /install/initrd/lib/modules/$(KVER)-ipfire && mv -f \
modules.alias.tmp modules.alias