LAVA Validation Lab

Merge lp:~tyler-baker/lava-lab/fix-bug-1134695 into lp:lava-lab

  1. fix-bug-1134695
  2. Merge into salt-states
Proposed by Tyler Baker
Status: Merged
Approved by: Senthil Kumaran S
Approved revision: 125
Merged at revision: 125
Proposed branch: lp:~tyler-baker/lava-lab/fix-bug-1134695
Merge into: lp:lava-lab
Diff against target: 14 lines (+7/-0)
1 file modified
lava/device-types/panda.conf (+7/-0)
To merge this branch: bzr merge lp:~tyler-baker/lava-lab/fix-bug-1134695
Reviewer Review Type Date Requested Status
Senthil Kumaran S Approve
Review via email: mp+162236@code.launchpad.net

Description of the change

Fix for bug 1134695

* Add a boot_cmds override in the panda.conf
* Set default boot_cmds override to boot_cmds
* Allow boot_cmds override to be boot_cmds, boot_cmds_android, boot_cmds_fdt

To post a comment you must log in.
Revision history for this message
Senthil Kumaran S (stylesen) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava/device-types/panda.conf'
2--- lava/device-types/panda.conf 2013-02-20 15:35:32 +0000
3+++ lava/device-types/panda.conf 2013-05-02 20:13:28 +0000
4@@ -6,3 +6,10 @@
5 setenv bootargs "'console=tty0 console=ttyO2,115200n8 root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000'",
6 boot
7
8+boot_options =
9+ boot_cmds
10+
11+[boot_cmds]
12+default = boot_cmds
13+allowed = boot_cmds, boot_cmds_android, boot_cmds_fdt
14+

Subscribers

People subscribed via source and target branches