Checkbox

Merge lp:~cr3/checkbox/efi into lp:checkbox

  1. efi
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1538
Proposed branch: lp:~cr3/checkbox/efi
Merge into: lp:checkbox
Diff against target: 25 lines (+2/-2)
2 files modified
jobs/info.txt.in (+1/-1)
scripts/efi_resource (+1/-1)
To merge this branch: bzr merge lp:~cr3/checkbox/efi
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+117066@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks, merging!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/info.txt.in'
2--- jobs/info.txt.in 2012-07-25 16:49:21 +0000
3+++ jobs/info.txt.in 2012-07-27 14:20:23 +0000
4@@ -28,7 +28,7 @@
5 name: efi_attachment
6 plugin: attachment
7 user: root
8-command: [ -d /sys/firmware/efi ] && grep -o --color=never 'EFI v.*' /var/log/kern.log || cat /sys/class/dmi/id/bios_version
9+command: [ -d /sys/firmware/efi ] && grep -o --color=never 'EFI v.*' /var/log/kern.log || true
10 _description: Attaches the firmware version
11
12 name: lspci_attachment
13
14=== modified file 'scripts/efi_resource'
15--- scripts/efi_resource 2012-07-13 21:51:25 +0000
16+++ scripts/efi_resource 2012-07-27 14:20:23 +0000
17@@ -24,7 +24,7 @@
18
19
20 # Command to retrieve efi information.
21-COMMAND = "[ -d /sys/firmware/efi ] && grep -o --color=never 'EFI v.*' /var/log/kern.log || cat /sys/class/dmi/id/bios_version"
22+COMMAND = "[ -d /sys/firmware/efi ] && grep -o --color=never 'EFI v.*' /var/log/kern.log || true"
23
24
25 class EfiResult:

Subscribers

People subscribed via source and target branches