Merge lp:~kentb/ubuntu/utopic/hw-detect/bug-1332187 into lp:ubuntu/utopic/hw-detect

[Kent Baxley]

Probe disk as well as usb-partition devices for the presence of an OEMDRV label. The Life Cycle Controller on a Dell server will export the OEMDRV as a usb-partition, but, HP iLO exports the driver disks as a disk. Without adding disk as an option, the HP iLO device will be overlooked by the driver-injection-disk script.

[Adam Conrad (adconrad)]

Looks like you have a typo there (you wanted "list-devices disk" not "list-devices-disk"), but I'll fix that and upload.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-07 09:32:31 +0000
+++ debian/changelog	2014-06-27 17:02:50 +0000
@@ -1,3 +1,10 @@
+hw-detect (1.95ubuntu4) utopic; urgency=medium
+
+  * driver-injection-disk.sh - probe disk and usb-partition 
+    for an OEMDRV label (LP: #1332187)
+
+ -- Kent Baxley <[e-mail]>  Fri, 27 Jun 2014 11:52:43 -0500
+
 hw-detect (1.95ubuntu3) utopic; urgency=medium
 
   * Drop "Register rtc module on i386 and amd64". Kernel dropped this

=== modified file 'driver-injection-disk.sh'
--- driver-injection-disk.sh	2013-10-04 10:40:26 +0000
+++ driver-injection-disk.sh	2014-06-27 17:02:50 +0000
@@ -29,7 +29,7 @@
 }
 
 #try to mount possible driver disk
-for device in $(list-devices usb-partition); do
+for device in $(list-devices-disk; list-devices usb-partition); do
 	label=$(block-attr --label $device 2>/dev/null || true)
 	if [ "$label" = "OEMDRV" ]; then
 		db_input high driver-injection-disk/load || true