From f7fa90b181c3306bf4882a93e32e9072912e3b14 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 4 May 2016 13:02:26 +0100 Subject: [PATCH] remove ability to set hostname as no longer needed. Hard code llmnrd name as 'docker' Signed-off-by: Justin Cormack --- alpine/mkinitrd.sh | 2 +- alpine/packages/hostsettings/etc/init.d/hostsettings | 3 +-- alpine/packages/llmnrd/etc/init.d/llmnrd | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alpine/mkinitrd.sh b/alpine/mkinitrd.sh index b91ef69b6..5b746c8ff 100755 --- a/alpine/mkinitrd.sh +++ b/alpine/mkinitrd.sh @@ -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 diff --git a/alpine/packages/hostsettings/etc/init.d/hostsettings b/alpine/packages/hostsettings/etc/init.d/hostsettings index cb1003770..22a04e2de 100755 --- a/alpine/packages/hostsettings/etc/init.d/hostsettings +++ b/alpine/packages/hostsettings/etc/init.d/hostsettings @@ -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 diff --git a/alpine/packages/llmnrd/etc/init.d/llmnrd b/alpine/packages/llmnrd/etc/init.d/llmnrd index 962d17690..8efec26c9 100755 --- a/alpine/packages/llmnrd/etc/init.d/llmnrd +++ b/alpine/packages/llmnrd/etc/init.d/llmnrd @@ -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 \