commit 495fcdd241f46e294bc442f89f398043b4b88f4d
author azvyagintsev <azvyagintsev@mirantis.com> Wed Oct 17 14:25:29 2018 +0300
committer Aleksey Zvyagintsev <azvyagintsev@mirantis.com> Wed Oct 17 11:41:03 2018 +0000
tree 2143329afd5857e7f0d260c68c9a658ef7caeaa9
parent c2d3889e3fd16d4325fcaf8cf48b97cbaf0eecda

Few changes

  * Completly drop autologin
  * Save some pillar.data fron recalss, if avaible

Bug-related: PROD-21462 (PROD:21462)

Change-Id: I63abd1174910671904308b64a39812d240aba86e

common/ubuntu_security.sh

diff --git a/common/ubuntu_security.sh b/common/ubuntu_security.sh
index 8d7c8c1..f2641c3 100644
--- a/common/ubuntu_security.sh
+++ b/common/ubuntu_security.sh
@@ -1,15 +1,5 @@
 #!/bin/bash -xe
 
-ROOT_AUTOLOGIN=""
-if [ "$(hostname)" != "ubuntu" ]; then
-    # Auto login root on tty1
-    sed 's|/sbin/agetty|/sbin/agetty --autologin root|g' /etc/systemd/system/getty.target.wants/getty@tty1.service > /etc/systemd/system/getty-autologin@.service
-    systemctl daemon-reload
-    systemctl disable getty@tty1.service
-    systemctl enable getty-autologin@tty1.service
-    ROOT_AUTOLOGIN="--autologin root"
-fi
-
 # Libvirt serial console support
 cat << EOF >> /etc/systemd/system/serial-getty@.service
 [Unit]
@@ -25,7 +15,7 @@
 ConditionPathExists=/dev/ttyS0
 
 [Service]
-ExecStart=-/sbin/agetty ${ROOT_AUTOLOGIN} -8 --noclear %I 115200 \$TERM
+ExecStart=-/sbin/agetty -8 --noclear %I 115200 \$TERM
 Type=idle
 Restart=always
 RestartSec=0