Linaro

Merge lp:~tom-gall/linaro/fix-712031-live-helper.config.natty.developer into lp:~linaro-maintainers/linaro/live-helper.config.natty.developer

  1. fix-712031-live-helper.config.natty.developer
  2. Merge into live-helper.config.natty.d...
Proposed by Tom Gall
Status: Merged
Merged at revision: 46
Proposed branch: lp:~tom-gall/linaro/fix-712031-live-helper.config.natty.developer
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.natty.developer
Diff against target: 19 lines (+9/-0)
2 files modified
binary_local-includes/etc/hostname (+1/-0)
binary_local-includes/etc/hosts (+8/-0)
To merge this branch: bzr merge lp:~tom-gall/linaro/fix-712031-live-helper.config.natty.developer
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+50040@code.launchpad.net

Description of the change

Merge fix for bug #712031 : add a minimal /etc/hosts and /etc/hostname into binary_local-include, during the live helper build this copies this file into place in the image as one of the very last steps in the build.

Included in this change is 127.0.1.1 linaro and the hostname is set as linaro

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'binary_local-includes/etc'
2=== added file 'binary_local-includes/etc/hostname'
3--- binary_local-includes/etc/hostname 1970-01-01 00:00:00 +0000
4+++ binary_local-includes/etc/hostname 2011-02-16 19:59:07 +0000
5@@ -0,0 +1,1 @@
6+linaro
7
8=== added file 'binary_local-includes/etc/hosts'
9--- binary_local-includes/etc/hosts 1970-01-01 00:00:00 +0000
10+++ binary_local-includes/etc/hosts 2011-02-16 19:59:07 +0000
11@@ -0,0 +1,8 @@
12+127.0.0.1 localhost
13+::1 localhost ip6-localhost ip6-loopback
14+fe00::0 ip6-localnet
15+ff00::0 ip6-mcastprefix
16+ff02::1 ip6-allnodes
17+ff02::2 ip6-allrouters
18+127.0.1.1 linaro
19+

Subscribers

People subscribed via source and target branches