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>
2025-07-19 17:26:28 +00:00 · 2022-12-15 13:12:19 +03:00 · 2022-12-15 13:12:19 +03:00 · 893bee6b81
commit 893bee6b81
parent c3b4a588c9
36 changed files with 44 additions and 36 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -225,7 +225,7 @@ jobs:

  test_linuxkit:
    name: LinuxKit Build Tests
-    needs: build
+    needs: [ build_packages, build ]
    runs-on: ubuntu-latest
    steps:
    - name: Check out code
@ -244,6 +244,14 @@ jobs:
        path: bin
        key: rtf-${{hashFiles('Makefile')}}

+    - name: Restore Package Cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.linuxkit/cache/
+        key: ${{ runner.os }}-linuxkit-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-linuxkit-
+
    - name: Build RTF
      if: steps.cache-rtf.outputs.cache-hit != 'true'
      run: make bin/rtf
--- a/examples/addbinds.yml
+++ b/examples/addbinds.yml
@ -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
--- a/examples/cadvisor.yml
+++ b/examples/cadvisor.yml
@ -22,7 +22,7 @@ onboot:

 services:
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
      - INSECURE=true
  - name: rngd
--- a/examples/dm-crypt-loop.yml
+++ b/examples/dm-crypt-loop.yml
@ -34,7 +34,7 @@ onboot:
      - /var:/var
 services:
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
  - name: rngd
--- a/examples/dm-crypt.yml
+++ b/examples/dm-crypt.yml
@ -28,7 +28,7 @@ onboot:
      - /var:/var
 services:
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
  - name: rngd
--- a/examples/docker-for-mac.yml
+++ b/examples/docker-for-mac.yml
@ -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
--- a/examples/docker.yml
+++ b/examples/docker.yml
@ -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
--- 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:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    # to make insecure with passwordless root login, uncomment following lines
    #env:
    # - INSECURE=true
--- a/examples/hostmount-writeable-overlay.yml
+++ b/examples/hostmount-writeable-overlay.yml
@ -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:
--- a/examples/influxdb-os.yml
+++ b/examples/influxdb-os.yml
@ -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
--- a/examples/logging.yml
+++ b/examples/logging.yml
@ -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
--- a/examples/minimal.yml
+++ b/examples/minimal.yml
@ -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
--- a/examples/node_exporter.yml
+++ b/examples/node_exporter.yml
@ -7,7 +7,7 @@ init:
  - linuxkit/containerd:de1b18eed76a266baa3092e5c154c84f595e56da
 services:
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
  - name: rngd
--- a/examples/platform-gcp.yml
+++ b/examples/platform-gcp.yml
@ -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
--- a/examples/platform-hetzner.yml
+++ b/examples/platform-hetzner.yml
@ -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
--- a/examples/platform-packet.yml
+++ b/examples/platform-packet.yml
@ -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
--- a/examples/platform-rt-for-vmware.yml
+++ b/examples/platform-rt-for-vmware.yml
@ -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
--- a/examples/platform-scaleway.yml
+++ b/examples/platform-scaleway.yml
@ -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
--- a/examples/platform-vmware.yml
+++ b/examples/platform-vmware.yml
@ -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
--- a/examples/platform-vultr.yml
+++ b/examples/platform-vultr.yml
@ -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
--- 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:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
  # Currently redis:4.0.6-alpine has trust issue with multi-arch
--- a/examples/sshd.yml
+++ b/examples/sshd.yml
@ -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
--- a/examples/static-ip.yml
+++ b/examples/static-ip.yml
@ -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:     
--- 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:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
  - name: rngd
--- 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:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
  - name: tss
--- a/examples/wireguard.yml
+++ b/examples/wireguard.yml
@ -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
--- a/linuxkit.yml
+++ b/linuxkit.yml
@ -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
  - name: rngd
--- a/pkg/getty/usr/bin/rungetty.sh
+++ b/pkg/getty/usr/bin/rungetty.sh
@ -82,4 +82,4 @@ for opt in $(cat /proc/cmdline); do
 done

 # 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
+[ -n "$INITGETTY" ] || wait
--- a/projects/compose/compose-dynamic.yml
+++ b/projects/compose/compose-dynamic.yml
@ -21,7 +21,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
--- a/projects/compose/compose-static.yml
+++ b/projects/compose/compose-static.yml
@ -21,7 +21,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
--- 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:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
 trust:
--- a/projects/miragesdk/examples/fdd.yml
+++ b/projects/miragesdk/examples/fdd.yml
@ -12,7 +12,7 @@ onboot:
    image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae
 services:
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
  - name: rngd
--- a/projects/miragesdk/examples/mirage-dhcp.yml
+++ b/projects/miragesdk/examples/mirage-dhcp.yml
@ -30,7 +30,7 @@ services:
  - name: sshd
    image: linuxkit/sshd:4696ba61c3ec091328e1c14857d77e675802342f
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
 files:
--- a/projects/okernel/examples/okernel_simple.yaml
+++ b/projects/okernel/examples/okernel_simple.yaml
@ -13,7 +13,7 @@ services:
  - name: dhcpcd
    image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
    env:
     - INSECURE=true
 trust:
--- a/projects/shiftfs/shiftfs.yml
+++ b/projects/shiftfs/shiftfs.yml
@ -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: rngd
--- a/test/cases/040_packages/007_getty-containerd/test.yml
+++ b/test/cases/040_packages/007_getty-containerd/test.yml
@ -12,7 +12,7 @@ onboot:
    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
 services:
  - name: getty
-    image: linuxkit/getty:76951a596aa5e0867a38e28f0b94d620e948e3e8
+    image: linuxkit/getty:c9d5afa9a61ac907904090643e946874ff6bf07c
 files:
  - path: etc/getty.shadow
    # sample sets password for root to "abcdefgh" (without quotes)