Merge lp:~tom-gall/linaro/fix-712031-live-helper.config.natty.nano into lp:~linaro-maintainers/linaro/live-helper.config.natty.nano
Proposed by
Tom Gall
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 45 | ||||
| Proposed branch: | lp:~tom-gall/linaro/fix-712031-live-helper.config.natty.nano | ||||
| Merge into: | lp:~linaro-maintainers/linaro/live-helper.config.natty.nano | ||||
| Diff against target: |
9 lines (+4/-0) (has conflicts) 1 file modified
binary_local-includes/etc/hostname (+4/-0) Text conflict in binary_local-includes/etc/hostname |
||||
| To merge this branch: | bzr merge lp:~tom-gall/linaro/fix-712031-live-helper.config.natty.nano | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-02-16.
Description of the change
Merge fix for bug #712031 : add a minimal /etc/hosts into binary_
---
Result of irc conversation, we're going to remove localdomain from hosts and hostname entirely and add the following entry to hosts
127.0.1.1 linaro
Also set hostname to linaro.
----
Summary of irc conversation
RFC2606 reserves localhost but does not reserve localdomain
IP-Address Full-Qualified-
To post a comment you must log in.
Revision history for this message
| Tom Gall (tom-gall) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+127.0.0.1 localhost.
Needs to list 'localhost' first as the canonical name.