LAVA master image scripts

Merge lp://qastaging/~dpigott/lava-master-image-scripts/fix-master-prompt into lp://qastaging/lava-master-image-scripts

fix-master-prompt
Merge into trunk

Proposed by Dave Pigott on 2013-03-04

Status:	Merged
Approved by:	Tyler Baker on 2013-03-05
Approved revision:	73
Merged at revision:	72
Proposed branch:	lp://qastaging/~dpigott/lava-master-image-scripts/fix-master-prompt
Merge into:	lp://qastaging/lava-master-image-scripts
Diff against target:	21 lines (+8/-3) 1 file modified lava-create-master (+8/-3)
To merge this branch:	bzr merge lp://qastaging/~dpigott/lava-master-image-scripts/fix-master-prompt
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Tyler Baker	2013-03-04	Approve on 2013-03-05
Zygmunt Krynicki (community)		Approve on 2013-03-04
Review via email: mp+151432@code.qastaging.launchpad.net

Description of the change

The old way of changing the master boot prompt involved a sed which expected the hostname to be "root@linaro-nano", which it rarely is anymore, so I've done a less subtle "just write the files" approach.

Revision history for this message

Zygmunt Krynicki (zyga) wrote on 2013-03-04:

Looks good, thanks

review: Approve

Revision history for this message

Zygmunt Krynicki (zyga) wrote on 2013-03-04:

dave: would you not like to have a tarmac instance that merges some of lava's trees

I found that manually merging branches is so annoying once you don't have to.

Revision history for this message

Antonio Terceiro (terceiro) wrote on 2013-03-04:

On Mon, Mar 04, 2013 at 08:49:21AM -0000, Dave Pigott wrote:
> === modified file 'lava-create-master'
> --- lava-create-master 2013-01-29 12:30:39 +0000
> +++ lava-create-master 2013-03-04 08:48:22 +0000
> @@ -407,9 +407,9 @@
>
> # Update hostname to 'master'
> verbose " * Changing hostname to 'master'..."
> - sed -e 's/linaro-nano/master/' -i \
> - $MASTER_MNT/etc/hostname \
> - $MASTER_MNT/etc/hosts
> + echo "master" > /etc/hostname
> + echo "127.0.0.1 localhost" > /etc/hosts
> + echo "127.0.1.1 master" >> /etc/hosts