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

Proposed by Tom Gall
Status: Merged
Merged at revision: 54
Proposed branch: lp:~tom-gall/linaro/fix-712031-live-helper.config.natty.netbook-efl
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.natty.netbook-efl
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.netbook-efl
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+50041@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
=== added directory 'binary_local-includes/etc'
=== added file 'binary_local-includes/etc/hostname'
--- binary_local-includes/etc/hostname 1970-01-01 00:00:00 +0000
+++ binary_local-includes/etc/hostname 2011-02-16 19:59:11 +0000
@@ -0,0 +1,1 @@
1linaro
02
=== added file 'binary_local-includes/etc/hosts'
--- binary_local-includes/etc/hosts 1970-01-01 00:00:00 +0000
+++ binary_local-includes/etc/hosts 2011-02-16 19:59:11 +0000
@@ -0,0 +1,8 @@
1127.0.0.1 localhost
2::1 localhost ip6-localhost ip6-loopback
3fe00::0 ip6-localnet
4ff00::0 ip6-mcastprefix
5ff02::1 ip6-allnodes
6ff02::2 ip6-allrouters
7127.0.1.1 linaro
8

Subscribers

People subscribed via source and target branches

to all changes: