diff --git a/usr/lib/archboot/cpio/hooks/base_common_system b/usr/lib/archboot/cpio/hooks/base_common_system index a6946d972..18b5d5069 100644 --- a/usr/lib/archboot/cpio/hooks/base_common_system +++ b/usr/lib/archboot/cpio/hooks/base_common_system @@ -80,8 +80,8 @@ id128,sysext} tar tee testpkg top touch trust tty unix_{chkpwd,update} /usr/lib/ _symlink /usr/lib/terminfo ../share/terminfo # add needed files from running system _map _file /etc/{crypttab,fstab,host.conf,hosts,inputrc,mke2fs.conf,nsswitch.conf,\ -protocols,request-key.conf,services} - for i in issue securetty tmpfiles.d/var.conf; do +protocols,request-key.conf,securetty,services} + for i in issue tmpfiles.d/var.conf; do _file_rename "/usr/share/archboot/base/etc/${i}" "/etc/${i}" done # fixing network support from glibc diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh index 6c61f5d4d..9deae2327 100644 --- a/usr/lib/archboot/login.sh +++ b/usr/lib/archboot/login.sh @@ -127,13 +127,13 @@ if [[ "${_TTY}" = "tty1" ]] ; then fi fi # start bottom on VC10 -while [[ "${_TTY}" = "tty10" ]] ; do +while [[ "${_TTY}" = "tty6" ]] ; do if command -v btm 2>"${_NO_LOG}"; then btm fi done # start bandwhich on VC9 -while [[ "${_TTY}" = "tty9" ]] ; do +while [[ "${_TTY}" = "tty5" ]] ; do if command -v bandwhich 2>"${_NO_LOG}"; then bandwhich fi diff --git a/usr/share/archboot/base/etc/securetty b/usr/share/archboot/base/etc/securetty deleted file mode 100644 index 5434edfe5..000000000 --- a/usr/share/archboot/base/etc/securetty +++ /dev/null @@ -1,14 +0,0 @@ -# File which lists terminals from which root can log in. -# See securetty(5) for details. - -console -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -tty9 -tty10 -ttyS0 -hvc0