From 4f72107c9882e432e1676f33d4d0d42716d7b65d Mon Sep 17 00:00:00 2001 From: Disassembler Date: Fri, 22 Mar 2019 09:59:33 +0100 Subject: [PATCH] Phase out serial TTY, update SSH MOTD --- _vm.sh | 2 +- _vm/etc/inittab | 1 - _vm/sbin/vmtty | 4 ++-- vmmgr | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/_vm.sh b/_vm.sh index cee8fdd..86e4bee 100755 --- a/_vm.sh +++ b/_vm.sh @@ -88,7 +88,7 @@ apk --no-cache add apache2-utils gettext wget https://dl.dasm.cz/_vm.tar -O - | tar xf - -C /mnt chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc libressl lxc postfix nginx openssh-server openssh-sftp-server util-linux wireguard-virt@et wireguard-tools-wg@et acme-sh@vm vmmgr@vm chroot /mnt newaliases -mkdir /mnt/var/log/lxc +mkdir -p /mnt/root/.ssh /mnt/var/log/lxc for SERVICE in cgroups consolefont crond iptables networking nginx ntpd postfix sshd swap urandom vmmgr; do ln -s /etc/init.d/${SERVICE} /mnt/etc/runlevels/boot done diff --git a/_vm/etc/inittab b/_vm/etc/inittab index 64b26de..811da22 100644 --- a/_vm/etc/inittab +++ b/_vm/etc/inittab @@ -7,7 +7,6 @@ # Set up getty tty1::respawn:/sbin/getty -n -l /sbin/vmtty 38400 tty1 -ttyS0::once:/sbin/getty -L 115200 ttyS0 xterm # Stuff to do for the 3-finger salute ::ctrlaltdel:/sbin/reboot diff --git a/_vm/sbin/vmtty b/_vm/sbin/vmtty index 7acea0f..5f476f1 100755 --- a/_vm/sbin/vmtty +++ b/_vm/sbin/vmtty @@ -2,7 +2,7 @@ # Rebuild /etc/issue /usr/bin/vmmgr rebuild-issue -# Remove double-escaping needed for the real /etc/issue -/bin/sed 's|\\\\|\\|g' /etc/issue +# Print /etc/issue +/bin/cat /etc/issue # Wait for key press read a diff --git a/vmmgr b/vmmgr index bba7e03..81d9bb7 160000 --- a/vmmgr +++ b/vmmgr @@ -1 +1 @@ -Subproject commit bba7e0383c4926a73b7485f83d8f7d2c5cfb7ad8 +Subproject commit 81d9bb74ee63af02e20acda532f925fab2affa0d