mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-24 03:15:36 +00:00
Merge pull request #2207 from justincormack/getty-x
remove -x from getty script
This commit is contained in:
commit
07469ac60b
@ -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
|
||||
|
@ -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
|
||||
|
33
pkg/getty/etc/securetty
Normal file
33
pkg/getty/etc/securetty
Normal file
@ -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
|
@ -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=*)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user