diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index eac0112f6..81bf38cad 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -53,7 +53,7 @@ services: image: linuxkit/acpid:1966310cb75e28ffc668863a6577ee991327f918 # Enable getty for easier debugging - name: getty - image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/docker.yml b/examples/docker.yml index 405e0d515..85e055422 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -20,7 +20,7 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index c8ec45d0f..ff0223fe0 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/metadata:f122f1b4e873f1d08cd67bd9105385fd923af0cb services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index 19fa74f62..0deab132a 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 7f721dc80..6a9dd58b8 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index d8341b598..a2db1c83d 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385 services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/examples/redis-os.yml b/examples/redis-os.yml index f0955ed50..469296b0a 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -13,7 +13,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 6702931f7..e3b022621 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/examples/swap.yml b/examples/swap.yml index f12a83878..ea1af90cf 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index 31ab609cb..6d5506888 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/examples/vultr.yml b/examples/vultr.yml index 619aa8c78..79e049efe 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/metadata:f122f1b4e873f1d08cd67bd9105385fd923af0cb services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/linuxkit.yml b/linuxkit.yml index a116eb5ce..dc9c7526c 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -20,7 +20,7 @@ onshutdown: command: ["/bin/echo", "so long and thanks for all the fish"] services: - name: getty - image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/pkg/getty/etc/init.d/001-getty b/pkg/getty/etc/init.d/001-getty index a36c70590..46205b2e9 100755 --- a/pkg/getty/etc/init.d/001-getty +++ b/pkg/getty/etc/init.d/001-getty @@ -2,4 +2,6 @@ # if we are here, then we need to debug a linuxkit build # so we always run in INSECURE mode -INSECURE=true /usr/bin/rungetty.sh +export INITGETTY=true +export INSECURE=true +/usr/bin/rungetty.sh diff --git a/pkg/getty/usr/bin/rungetty.sh b/pkg/getty/usr/bin/rungetty.sh index e8ae401f5..8cb89e877 100755 --- a/pkg/getty/usr/bin/rungetty.sh +++ b/pkg/getty/usr/bin/rungetty.sh @@ -56,5 +56,5 @@ for opt in $(cat /proc/cmdline); do esac done -# wait for all our child process to exit; tini will handle subreaping, if necessary -wait +# if we are in a container (not in root init) wait for all our child process to exit; tini will handle subreaping, if necessary +[ -z "$INITGETTY" ] && wait diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 6e7ab0dec..b9241127d 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -27,7 +27,7 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 0aea62330..23ef4345e 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -27,7 +27,7 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 582772703..76815d0c9 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -30,7 +30,7 @@ services: - name: sshd image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb - name: getty - image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 45cb3da65..25462163e 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e env: - INSECURE=true - name: rngd diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test-ctr.yml index 37e294982..b5ac3ad6b 100644 --- a/test/cases/040_packages/007_getty-containerd/test-ctr.yml +++ b/test/cases/040_packages/007_getty-containerd/test-ctr.yml @@ -12,7 +12,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754 + image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes)