Merge pull request #2241 from deitch/fix-getty-background

flag in init and background only if not in init

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

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

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

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

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:

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

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

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

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

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

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

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

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

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

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

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

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:

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

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)