Merge pull request #2207 from justincormack/getty-x

remove -x from getty script

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:5ab31289889d61a5d2ecbeea8e36ce74ac54737c
+    image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754
     env:
         - INSECURE=true
   # Run ntpd to keep time synchronised in the VM

linuxkit.yml

@@ -16,7 +16,7 @@ onboot:
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
 services:
   - name: getty
-    image: linuxkit/getty:5ab31289889d61a5d2ecbeea8e36ce74ac54737c
+    image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754
     env:
      - INSECURE=true
   - name: rngd

pkg/getty/etc/securetty

@@ -0,0 +1,33 @@
+console
+tty1
+tty2
+tty3
+tty4
+tty5
+tty6
+tty7
+tty8
+tty9
+tty10
+tty11
+
+# UART serial ports
+ttyS0
+ttyS1
+ttyS2
+ttyS3
+
+# IBM iSeries/pSeries virtual console, Xen
+hvc0
+hvc1
+
+#IBM pSeries console ports
+hvsi0
+hvsi1
+
+# ARM "AMBA" serial ports
+ttyAM0
+ttyAM1
+
+# s390 and s390x ports in LPAR mode
+ttysclp0

pkg/getty/usr/bin/rungetty.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-set -x
 
 infinite_loop() {
 	while true; do
@@ -50,13 +49,6 @@ if [ -f $ROOTSHADOW ]; then
 	echo >> /etc/shadow
 fi
 
-ROOTSTTY=/hostroot/etc/securetty
-if [ -f $ROOTSTTY ]; then
-	cp $ROOTSTTY /etc/securetty
-	# just in case someone forgot a newline
-	echo >> /etc/securetty
-fi
-
 for opt in $(cat /proc/cmdline); do
 	case "$opt" in
 	console=*)

projects/kubernetes/kube-master.yml

@@ -26,7 +26,7 @@ onboot:
      - /var:/var:rshared,rbind
 services:
   - name: getty
-    image: linuxkit/getty:5ab31289889d61a5d2ecbeea8e36ce74ac54737c
+    image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754
     env:
      - INSECURE=true
   - name: rngd

projects/kubernetes/kube-node.yml

@@ -26,7 +26,7 @@ onboot:
      - /var:/var:rshared,rbind
 services:
   - name: getty
-    image: linuxkit/getty:5ab31289889d61a5d2ecbeea8e36ce74ac54737c
+    image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754
     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:5ab31289889d61a5d2ecbeea8e36ce74ac54737c
+    image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754
     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:5ab31289889d61a5d2ecbeea8e36ce74ac54737c
+    image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754
     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:5ab31289889d61a5d2ecbeea8e36ce74ac54737c
+    image: linuxkit/getty:deb9332e786e72591bd9be200bcc9c7a534eb754
 files:
   - path: etc/getty.shadow
     # sample sets password for root to "abcdefgh" (without quotes)