summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-08-30 07:05:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-08-30 07:05:34 +0200
commitf4259455c2ad5c2f74290bfa710bf7689023d423 (patch)
tree9d750af6903f17e362db45dc973f78df5eca2796
parent36197e445d0bde5785bb1a823b0e83c4f5b89ccb (diff)
finetune /etc/hosts
It should look like: 127.0.0.1 localhost ::1 loaclhost 127.0.1.1 hostname
-rw-r--r--package/base-files/Makefile6
-rw-r--r--package/base-files/src/etc/hosts2
-rw-r--r--target/config/Config.in.runtime2
3 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 974823904..28fb34348 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 45
+PKG_RELEASE:= 46
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
@@ -67,7 +67,9 @@ endif
$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
test -z $(ADK_RUNTIME_HOSTNAME) || \
echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
- echo "127.0.0.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts
+ echo "127.0.0.1 localhost" > $(IDIR_BASE_FILES)/etc/hosts
+ echo "::1 localhost" >> $(IDIR_BASE_FILES)/etc/hosts
+ echo "127.0.1.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts
test -z $(ADK_RUNTIME_PASSWORD) || \
$(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/tools/mkcrypt \
${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
diff --git a/package/base-files/src/etc/hosts b/package/base-files/src/etc/hosts
deleted file mode 100644
index 085363292..000000000
--- a/package/base-files/src/etc/hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-::1 localhost
-127.0.0.1 localhost
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 0503eb8d9..2c1ccb1d1 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -3,7 +3,7 @@
config ADK_RUNTIME_HOSTNAME
string "hostname for the embedded system"
- default "localhost"
+ default "openadk"
help
Set your target hostname.