remove ability to set hostname as no longer needed. Hard code llmnrd name as 'docker'

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-05-04 13:02:26 +01:00
parent ea5636df85
commit f7fa90b181
3 changed files with 4 additions and 4 deletions

View File

@ -84,7 +84,7 @@ nameserver 2001:4860:4860::8888
nameserver 2001:4860:4860::8844
EOF
printf 'docker' > /tmp/etc/hostname
printf 'moby' > /tmp/etc/hostname
rm /tmp/bin/mkinitrd.sh

View File

@ -3,13 +3,12 @@
description="Configuring settings from database."
depend() {
before hostname sysctl
before sysctl
}
start() {
ebegin "Configuring host settings from database"
mobyconfig exists etc/hostname && echo $(mobyconfig get etc/hostname) > /etc/hostname
mobyconfig exists etc/sysctl.conf && mobyconfig get etc/sysctl.conf > /etc/sysctl.conf
eend 0

View File

@ -16,7 +16,8 @@ start()
[ -n "${PIDFILE}" ] || PIDFILE=/var/run/llmnrd.pid
export HOSTNAME=$(hostname -s)
# always serve as 'docker'
export HOSTNAME=docker
start-stop-daemon --start --quiet \
--background \