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

Proposed by Kent Baxley on 2014-06-27
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp:~kentb/ubuntu/utopic/hw-detect/bug-1332187
Merge into: lp:ubuntu/utopic/hw-detect
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
driver-injection-disk.sh (+1/-1)
To merge this branch: bzr merge lp:~kentb/ubuntu/utopic/hw-detect/bug-1332187
Reviewer Review Type Date Requested Status
Adam Conrad 2014-06-27 Approve on 2014-07-03
Review via email: mp+224875@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Adam Conrad (adconrad) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-05-07 09:32:31 +0000
3+++ debian/changelog 2014-06-27 17:02:50 +0000
4@@ -1,3 +1,10 @@
5+hw-detect (1.95ubuntu4) utopic; urgency=medium
6+
7+ * driver-injection-disk.sh - probe disk and usb-partition
8+ for an OEMDRV label (LP: #1332187)
9+
10+ -- Kent Baxley <kent.baxley@canonical.com> Fri, 27 Jun 2014 11:52:43 -0500
11+
12 hw-detect (1.95ubuntu3) utopic; urgency=medium
13
14 * Drop "Register rtc module on i386 and amd64". Kernel dropped this
15
16=== modified file 'driver-injection-disk.sh'
17--- driver-injection-disk.sh 2013-10-04 10:40:26 +0000
18+++ driver-injection-disk.sh 2014-06-27 17:02:50 +0000
19@@ -29,7 +29,7 @@
20 }
21
22 #try to mount possible driver disk
23-for device in $(list-devices usb-partition); do
24+for device in $(list-devices-disk; list-devices usb-partition); do
25 label=$(block-attr --label $device 2>/dev/null || true)
26 if [ "$label" = "OEMDRV" ]; then
27 db_input high driver-injection-disk/load || true

Subscribers

People subscribed via source and target branches

to all changes: