[PATCH] UBUNTU: [Config] Disable libusual and the ub driver

[Scott James Remnant]

Bug: #363038

The ub driver is an old attempt for a slow USB Block Device driver,
it hasn't been maintained in quite a while and we don't have an easy
way to enable it.

libusual is a strange mechanism for the kernel to auto-select between
usb-storage and ub.  It works by stealing the aliases from them both
and modprobe'ing (from the kernel) the other module when a device is
connected.

The trouble is that because it's built into the kernel, on machines with
particularly fast init, it could be trying to call it before the initramfs
has even been switched to - or before the initramfs has called "depmod".
In either case, since there's no modules.alias/modules.dep files, the
modprobe call with fail and the USB storage device will not be enabled.

Plugging a second USB storage device in will magically cure the problem.

Signed-off-by: Scott James Remnant <scott at canonical.com>
---
 debian/config/amd64/config       |   10 +++-------
 debian/config/i386/config        |    4 ++--
 debian/config/i386/config.server |    5 +----
 debian/config/lpia/config        |    4 ++--
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index cc350e9..ce5d897 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -309,7 +309,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_BLOCK=y
@@ -1095,7 +1095,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_HAVE_HW_BRANCH_TRACER=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -1226,7 +1225,6 @@ CONFIG_HVC_XEN=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=m
-# CONFIG_HW_BRANCH_TRACER is not set
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_AMD=m
@@ -3496,7 +3494,7 @@ CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LED=m
 CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LIBUSUAL=y
+# CONFIG_USB_LIBUSUAL is not set
 CONFIG_USB_M5602=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
@@ -3848,7 +3846,7 @@ CONFIG_X86_CPU=y
 CONFIG_X86_CPUID=m
 CONFIG_X86_CPU_DEBUG=m
 CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_X86_DS=y
+# CONFIG_X86_DS is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_HT=y
 CONFIG_X86_INTERNODE_CACHE_BYTES=64
@@ -3866,14 +3864,12 @@ CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_PTDUMP is not set
-CONFIG_X86_PTRACE_BTS=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_X86_SPEEDSTEP_CENTRINO=y
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y
-# CONFIG_X86_UV is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_X86_VSMP is not set
 CONFIG_X86_WP_WORKS_OK=y
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 623e6e8..921f47b 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -324,7 +324,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_BLK_DEV_XIP is not set
@@ -3725,7 +3725,7 @@ CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LED=m
 CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LIBUSUAL=y
+# CONFIG_USB_LIBUSUAL is not set
 CONFIG_USB_M5602=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
diff --git a/debian/config/i386/config.server b/debian/config/i386/config.server
index dfde6ae..5f6df46 100644
--- a/debian/config/i386/config.server
+++ b/debian/config/i386/config.server
@@ -10,12 +10,10 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_HAVE_HW_BRANCH_TRACER=y
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
-# CONFIG_HW_BRANCH_TRACER is not set
 CONFIG_HZ=100
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
@@ -29,10 +27,9 @@ CONFIG_X86_CMOV=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CPU_DEBUG=m
 CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_X86_DS=y
+# CONFIG_X86_DS is not set
 # CONFIG_X86_E_POWERSAVER is not set
 CONFIG_X86_PAE=y
-CONFIG_X86_PTRACE_BTS=y
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_XEN=y
diff --git a/debian/config/lpia/config b/debian/config/lpia/config
index d82ef26..e2ac0a6 100644
--- a/debian/config/lpia/config
+++ b/debian/config/lpia/config
@@ -269,7 +269,7 @@ CONFIG_BLK_DEV_SD=m
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_BLK_DEV_XIP is not set
@@ -3342,7 +3342,7 @@ CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LED=m
 CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LIBUSUAL=y
+# CONFIG_USB_LIBUSUAL is not set
 # CONFIG_USB_M5602 is not set
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
-- 
1.6.0.4