github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1704 from ijc25/fix-unique-fallback-hostname

Browse Source 
Switch fallback hostname to linuxkit-* from moby-*
This commit is contained in:
Rolf Neugebauer 2017-04-26 09:54:19 +01:00 committed by GitHub
commit 115b09faad
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/minimal.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551 - linuxkit/init:1c8cd75ec89313f4058b069449e9bac966cd96b1
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
onboot: onboot:

2
examples/node_exporter.yml
View File

@ -3,7 +3,7 @@ kernel:
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
- linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551 - linuxkit/init:1c8cd75ec89313f4058b069449e9bac966cd96b1
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
services: services:

6
kernel/Makefile
View File

@ -20,18 +20,18 @@ all: bzImage tag
# IMAGE_VERSION is used to determine if a new image should be pushed to hub. # IMAGE_VERSION is used to determine if a new image should be pushed to hub.
ifeq ($(KERNEL),v4.4) ifeq ($(KERNEL),v4.4)
KERNEL_VERSION=4.4.61 KERNEL_VERSION=4.4.61
IMAGE_VERSION=$(KERNEL_VERSION)-0 IMAGE_VERSION=$(KERNEL_VERSION)-1
IMAGE_MAJOR_VERSION=4.4.x IMAGE_MAJOR_VERSION=4.4.x
DEPS=Dockerfile.4.4 Makefile kernel_config kernel_config.debug kernel_config.4.4 patches-4.4 DEPS=Dockerfile.4.4 Makefile kernel_config kernel_config.debug kernel_config.4.4 patches-4.4
else else
ifeq ($(KERNEL),v4.10) ifeq ($(KERNEL),v4.10)
KERNEL_VERSION=4.10.10 KERNEL_VERSION=4.10.10
IMAGE_VERSION=$(KERNEL_VERSION)-0 IMAGE_VERSION=$(KERNEL_VERSION)-1
IMAGE_MAJOR_VERSION=4.10.x IMAGE_MAJOR_VERSION=4.10.x
DEPS=Dockerfile.4.10 Makefile kernel_config kernel_config.debug patches-4.10 DEPS=Dockerfile.4.10 Makefile kernel_config kernel_config.debug patches-4.10
else else
KERNEL_VERSION=4.9.22 KERNEL_VERSION=4.9.22
IMAGE_VERSION=$(KERNEL_VERSION)-0 IMAGE_VERSION=$(KERNEL_VERSION)-1
IMAGE_MAJOR_VERSION=4.9.x IMAGE_MAJOR_VERSION=4.9.x
DEPS=Dockerfile Makefile kernel_config kernel_config.debug patches-4.9 DEPS=Dockerfile Makefile kernel_config kernel_config.debug patches-4.9
endif endif

2
kernel/kernel_config
View File

@ -67,7 +67,7 @@ CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZO is not set
# CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_LZ4 is not set
CONFIG_DEFAULT_HOSTNAME="moby" CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYSVIPC_SYSCTL=y

2
linuxkit.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551 - linuxkit/init:1c8cd75ec89313f4058b069449e9bac966cd96b1
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

4
pkg/init/etc/init.d/rcS
View File

@ -83,10 +83,10 @@ then
hostname -F /etc/hostname hostname -F /etc/hostname
fi fi
if [ $(hostname) = "moby" -a -f /sys/class/net/eth0/address ] if [ $(hostname) = "(none)" -a -f /sys/class/net/eth0/address ]
then then
mac=$(cat /sys/class/net/eth0/address) mac=$(cat /sys/class/net/eth0/address)
hostname moby-$(echo $mac | sed 's/://g') hostname linuxkit-$(echo $mac | sed 's/://g')
fi fi
# set system clock from hwclock # set system clock from hwclock

2
projects/etcd/etcd.yml
View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551 - linuxkit/init:1c8cd75ec89313f4058b069449e9bac966cd96b1
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

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

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