From f41c9764064e349293ce70b2fa79072d17a5bbc9 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Mon, 17 Jul 2017 16:39:45 +0100 Subject: [PATCH 1/4] getty: Detect if you are in a namespace This is an attempt at fixing #2213 If `INITGETTY` has been set then we are not in a namespace. Signed-off-by: Avi Deitcher --- pkg/getty/etc/profile.d/namespace.sh | 1 - pkg/getty/usr/bin/rungetty.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) delete mode 100644 pkg/getty/etc/profile.d/namespace.sh diff --git a/pkg/getty/etc/profile.d/namespace.sh b/pkg/getty/etc/profile.d/namespace.sh deleted file mode 100644 index db350f3fa..000000000 --- a/pkg/getty/etc/profile.d/namespace.sh +++ /dev/null @@ -1 +0,0 @@ -export PS1="(ns: getty) $PS1" diff --git a/pkg/getty/usr/bin/rungetty.sh b/pkg/getty/usr/bin/rungetty.sh index 8cb89e877..68262087e 100755 --- a/pkg/getty/usr/bin/rungetty.sh +++ b/pkg/getty/usr/bin/rungetty.sh @@ -41,6 +41,14 @@ start_getty() { infinite_loop setsid.getty -w /sbin/agetty $loginargs $line $speed $tty $term & } + +# check if we are namespaced, and, if so, indicate in the PS1 +if [ -z "$INIGETTY" ]; then + cat >/etc/profile.d/namespace.sh <<"EOF" +export PS1="(ns: getty) $PS1" +EOF +fi + # check if we have /etc/getty.shadow ROOTSHADOW=/hostroot/etc/getty.shadow if [ -f $ROOTSHADOW ]; then From 5cda493a21870b736bd149653a3b6de23d974c6a Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 27 Jul 2017 14:24:22 +0300 Subject: [PATCH 2/4] Update hashes for getty Signed-off-by: Avi Deitcher --- blueprints/docker-for-mac/base.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vultr.yml | 2 +- linuxkit.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/040_packages/007_getty-containerd/test-ctr.yml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index c9a25e7bf..909fb5912 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/docker.yml b/examples/docker.yml index d0da8273d..9509f3b22 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -20,7 +20,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 42167397c..767fa2756 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index 9f08094a1..c92b39ab2 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index 7a2a5d874..fd332d9ed 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 94323aea3..a99f8f56a 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 2ff1cb204..8d0dd4fab 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index 767cf203c..bb5a5e90f 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/examples/swap.yml b/examples/swap.yml index ae3185a58..91b238933 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index 83b9f452b..cd9f9eb3b 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/examples/vultr.yml b/examples/vultr.yml index 7fab7e7e3..8c65c5215 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/linuxkit.yml b/linuxkit.yml index b45f25a6c..c7ecbc432 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 153978449..b71c90f31 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -30,7 +30,7 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index c1f315165..a56d6b46f 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -30,7 +30,7 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 1b953a745..2c89701e4 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:6cbeee0392b0670053ce2bf05a5a0d67ec2bce05 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index a59ea0e8a..9be662e92 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:dc98a72c1d1285c30f2db176252f3ce2bf645d5b - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index ec59634fe..75fa7087f 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: rngd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e84c9b6d9..c5cf57e95 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -23,7 +23,7 @@ onboot: image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 env: - INSECURE=true - name: qemu-ga 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 53221be35..75f66e22c 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:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 + image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes) From 543e61c643cb3c1291345c0b74cf90255fd83700 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 27 Jul 2017 15:38:20 +0300 Subject: [PATCH 3/4] Fix typo Signed-off-by: Avi Deitcher --- pkg/getty/usr/bin/rungetty.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/getty/usr/bin/rungetty.sh b/pkg/getty/usr/bin/rungetty.sh index 68262087e..1a474fb86 100755 --- a/pkg/getty/usr/bin/rungetty.sh +++ b/pkg/getty/usr/bin/rungetty.sh @@ -43,7 +43,7 @@ start_getty() { # check if we are namespaced, and, if so, indicate in the PS1 -if [ -z "$INIGETTY" ]; then +if [ -z "$INITGETTY" ]; then cat >/etc/profile.d/namespace.sh <<"EOF" export PS1="(ns: getty) $PS1" EOF From d4f587866962d3d2f9cbef19daff2b251ef83452 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 27 Jul 2017 15:45:19 +0300 Subject: [PATCH 4/4] Update hashes in examples --- blueprints/docker-for-mac/base.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vultr.yml | 2 +- linuxkit.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/040_packages/007_getty-containerd/test-ctr.yml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 909fb5912..3bb89f3ab 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true # Run ntpd to keep time synchronised in the VM diff --git a/examples/docker.yml b/examples/docker.yml index 9509f3b22..1104bef29 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -20,7 +20,7 @@ onboot: command: ["/usr/bin/mountie", "/var/lib/docker"] services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 767fa2756..aba6cd3ca 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index c92b39ab2..d2b469ed6 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index fd332d9ed..e29c93ab3 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index a99f8f56a..857d4effd 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 8d0dd4fab..ca26f71c4 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index bb5a5e90f..ca0b5a682 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/examples/swap.yml b/examples/swap.yml index 91b238933..a20d5f602 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/examples/tpm.yml b/examples/tpm.yml index fd381a650..e190c246a 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:1b651a91f1c17f50357be9873b580ccf81668630 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: tss diff --git a/examples/vmware.yml b/examples/vmware.yml index cd9f9eb3b..ac7f36bbf 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/examples/vultr.yml b/examples/vultr.yml index 8c65c5215..26acadd0d 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -16,7 +16,7 @@ onboot: image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/linuxkit.yml b/linuxkit.yml index c7ecbc432..d2bafa6af 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index b71c90f31..2e0d0c3cb 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -30,7 +30,7 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index a56d6b46f..6d4589595 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -30,7 +30,7 @@ onboot: - /var/lib:/var/lib services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 05a46c9a3..8d5239cf8 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: linuxkit/getty:0bd92d5f906491c20e4177c57f965338fe5a8c5f + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true trust: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 2c89701e4..31d0cef6f 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 9be662e92..0b069d75b 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:dc98a72c1d1285c30f2db176252f3ce2bf645d5b - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 75fa7087f..8754069fb 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: rngd diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index c5cf57e95..1f79ad019 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -23,7 +23,7 @@ onboot: image: linuxkit/metadata:f5d4299909b159db35f72547e4ae70bd76c42c6c services: - name: getty - image: linuxkit/getty:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 env: - INSECURE=true - name: qemu-ga 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 75f66e22c..0e8ad73aa 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:b4cdc4101eb41ce2b8aaf1ef0209445ebdc577b4 + image: linuxkit/getty:58620cff1b0bf8b5d144d087602115e996f18a02 files: - path: etc/getty.shadow # sample sets password for root to "abcdefgh" (without quotes)