From 9e70f7de8bc4c5c6b6aea0cb51ac2cdd7f419272 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 1 Jul 2008 19:30:03 +0200
Subject: [PATCH] Disabled ub driver add rootdelay to grub because usbstorage
 need more time to setup the devices

---
 config/grub/grub.conf                | 16 ++++++++--------
 config/kernel/kernel.config.i586     |  2 +-
 config/kernel/kernel.config.i586.smp |  2 +-
 lfs/initrd                           |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 911fce5e95..26a29040ca 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -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
diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index 8d3bbbb44b..c718f72c47 100644
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -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
diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index ea890eb0f4..d1a7fe3e72 100644
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -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
diff --git a/lfs/initrd b/lfs/initrd
index 352be80a1f..6b8e91b579 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -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
-- 
2.39.2