From c02ed8e3930c62a720a2b428c7f1dee4ac0967df Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 9 Jul 2024 11:38:29 +0200 Subject: [PATCH] launch bottom on VC10 and bandwhich on VC9 --- usr/lib/archboot/cpio/hooks/base_common_system | 2 +- usr/lib/archboot/login.sh | 12 ++++++++++++ usr/share/archboot/base/etc/securetty | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 usr/share/archboot/base/etc/securetty diff --git a/usr/lib/archboot/cpio/hooks/base_common_system b/usr/lib/archboot/cpio/hooks/base_common_system index a9d6b28e3..ce49c9dc5 100644 --- a/usr/lib/archboot/cpio/hooks/base_common_system +++ b/usr/lib/archboot/cpio/hooks/base_common_system @@ -63,7 +63,7 @@ id128,sysext} tar tee testpkg top touch trust tty unix_{chkpwd,update} /usr/lib/ fi # add zoxide echo "eval \"\$(zoxide init bash)\"" >> ${_ROOTFS}/root/.bashrc - # add resolve.conf + # add resolve.conf symlink _symlink /etc/resolv.conf ../run/systemd/resolve/stub-resolv.conf # add libsasl _map _full_dir /usr/lib/{sasl2,girepository-1.0} diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh index 889eac25f..6c61f5d4d 100644 --- a/usr/lib/archboot/login.sh +++ b/usr/lib/archboot/login.sh @@ -126,6 +126,18 @@ if [[ "${_TTY}" = "tty1" ]] ; then [[ -e /etc/systemd/system/pacman-init.service ]] && systemctl start pacman-init fi fi +# start bottom on VC10 +while [[ "${_TTY}" = "tty10" ]] ; do + if command -v btm 2>"${_NO_LOG}"; then + btm + fi +done +# start bandwhich on VC9 +while [[ "${_TTY}" = "tty9" ]] ; do + if command -v bandwhich 2>"${_NO_LOG}"; then + bandwhich + fi +done if [[ -e /usr/bin/setup ]]; then _local_mode # wait on user interaction! diff --git a/usr/share/archboot/base/etc/securetty b/usr/share/archboot/base/etc/securetty new file mode 100644 index 000000000..5434edfe5 --- /dev/null +++ b/usr/share/archboot/base/etc/securetty @@ -0,0 +1,14 @@ +# 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