github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-01 15:08:33 +00:00
Code Issues Projects Releases Wiki Activity

Switch fallback hostname to linuxkit-* from moby-*

Browse Source 
This was missed when things were renamed.

The intention with this code was (apparently) to provide a (pseudo)unique
hostname in the case where something more specific was not provided (e.g. by
DHCP). Make this a little clearer by using '(none)' rather than 'linuxkit' as
the default, in the normal case this will be overwritten by something more
specific and if it isn't we will change it to something somewhat unique derived
from the MAC address (as before). nb: '(none)' is already used by Debian so I
think it is a safe choice as the sentinel value.

The use of both CONFIG_DEFAULT_HOSTNAME and the explicit /etc/hostname from
mkimage.sh is likely to be redundant in some cases, but neither seems to
completely cover all cases so keep both.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell
2017-04-25 13:50:42 +01:00
parent 35d8070abc
commit 20cfa2af2c
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/mkimage-base/mkimage.sh
View File

@@ -39,7 +39,7 @@ nameserver 2001:4860:4860::8888
nameserver 2001:4860:4860::8844
EOF
printf 'linuxkit' > etc/hostname
printf '(none)' > etc/hostname
ln -s /proc/mounts etc/mtab