Fix return code of rungetty.sh (#3881)

* Fix return code of rungetty.sh

In case of INITGETTY defined we will return exit code 1 which is not
expected

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>

* Update getty sha

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>

* restore package cache in LinuxKit Build Tests

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
This commit is contained in:
Petr Fedchenkov
2022-12-15 13:12:19 +03:00
committed by GitHub
parent c3b4a588c9
commit 893bee6b81
36 changed files with 44 additions and 36 deletions

View File

@@ -14,7 +14,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
binds.add:
# this will keep all of the existing ones as well
- /var/tmp:/var/tmp

View File

@@ -22,7 +22,7 @@ onboot:
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -34,7 +34,7 @@ onboot:
- /var:/var
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -28,7 +28,7 @@ onboot:
- /var:/var
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -52,7 +52,7 @@ services:
image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d
# Enable getty for easier debugging
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
# Run ntpd to keep time synchronised in the VM

View File

@@ -18,7 +18,7 @@ onboot:
command: ["/usr/bin/mountie", "/var/lib/docker"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -14,7 +14,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
# to make insecure with passwordless root login, uncomment following lines
#env:
# - INSECURE=true

View File

@@ -18,7 +18,7 @@ onshutdown:
command: ["/bin/echo", "so long and thanks for all the fish"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
runtime:

View File

@@ -12,7 +12,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: influxdb

View File

@@ -17,7 +17,7 @@ onboot:
services:
# Inside the getty type `/proc/1/root/usr/bin/logread -F` to follow the log
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
# A service which generates log messages for testing

View File

@@ -11,6 +11,6 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true

View File

@@ -7,7 +7,7 @@ init:
- linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -16,7 +16,7 @@ onboot:
image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -24,7 +24,7 @@ services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: sshd

View File

@@ -24,7 +24,7 @@ services:
- name: rngd
image: linuxkit/rngd:4f85d8de3f6f45973a8c88dc8fba9ec596e5495a
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: sshd

View File

@@ -11,7 +11,7 @@ onboot:
image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -19,7 +19,7 @@ onboot:
image: linuxkit/metadata:646c00ad6c0b3fc246b6af9ccfcd6b1eb6b6da8a
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -11,7 +11,7 @@ onboot:
image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -17,7 +17,7 @@ onboot:
command: ["/usr/bin/metadata", "vultr"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -13,7 +13,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
# Currently redis:4.0.6-alpine has trust issue with multi-arch

View File

@@ -14,7 +14,7 @@ onboot:
command: ["/sbin/rngd", "-1"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -13,7 +13,7 @@ onboot:
command: ["ip", "-b", "/etc/ip/eth0.conf"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
files:

View File

@@ -24,7 +24,7 @@ onboot:
command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: rngd

View File

@@ -14,7 +14,7 @@ onboot:
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
- name: tss

View File

@@ -40,7 +40,7 @@ onboot:
net: /run/netns/wg1
services:
- name: getty
image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
env:
- INSECURE=true
net: /run/netns/wg1