From bfa1341a214342b7104315a0a28124297a323b08 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 5 Dec 2023 08:31:01 +0100 Subject: [PATCH] Fix services tty output (#557) * Fix serivces tty output - interactive installer: output was not connected to tty so it was impossible to answer any questions - reset: was not getting the output and taking over the tty so it got overwritten by other output. It could be stopped in the middle - installer: same as above but it could lead to stopping the install in the middle of it - recovery: same as above, QR code didnt even display Signed-off-by: Itxaka * Update packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service --------- Signed-off-by: Itxaka Co-authored-by: Mauro Morales --- packages/static/kairos-overlay-files/collection.yaml | 2 +- .../files/etc/systemd/system/kairos-interactive.service | 5 ++++- .../files/etc/systemd/system/kairos-recovery.service | 2 +- .../files/etc/systemd/system/kairos-reset.service | 3 ++- .../files/etc/systemd/system/kairos.service | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index 664d379..e7b1adf 100644 --- a/packages/static/kairos-overlay-files/collection.yaml +++ b/packages/static/kairos-overlay-files/collection.yaml @@ -1,4 +1,4 @@ packages: - name: "kairos-overlay-files" category: "static" - version: "1.1.13" + version: "1.1.14" diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service index 6056e0e..21c4101 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service @@ -3,12 +3,15 @@ Description=kairos interactive-installer After=sysinit.target [Service] Type=oneshot +# input/output to tty as its interactive +# otherwise it will be silent and with no input StandardInput=tty -StandardOutput=journal+console +StandardOutput=tty LimitNOFILE=49152 ExecStartPre=-/bin/sh -c "dmesg -D" TTYPath=/dev/tty1 RemainAfterExit=yes ExecStart=/usr/bin/kairos-agent interactive-install --shell +TimeoutStopSec=10s [Install] WantedBy=multi-user.target diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service index d5de9fc..0c9cc2c 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service @@ -4,7 +4,7 @@ After=sysinit.target [Service] Type=oneshot StandardInput=tty -StandardOutput=journal+console +StandardOutput=tty LimitNOFILE=49152 ExecStartPre=-/bin/sh -c "dmesg -D" ExecStartPre=-/bin/sh -c "sysctl -w net.core.rmem_max=2500000" diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service index 01cb51c..7bc2762 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service @@ -4,10 +4,11 @@ After=sysinit.target [Service] Type=oneshot StandardInput=tty -StandardOutput=journal+console +StandardOutput=tty LimitNOFILE=49152 TTYPath=/dev/tty1 RemainAfterExit=yes ExecStart=/usr/bin/kairos-agent reset --unattended --reboot +TimeoutStopSec=10s [Install] WantedBy=multi-user.target diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service index 5afee24..f440582 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service @@ -4,7 +4,7 @@ After=sysinit.target [Service] Type=oneshot StandardInput=tty -StandardOutput=journal+console +StandardOutput=tty LimitNOFILE=49152 ExecStartPre=-/bin/sh -c "dmesg -D" TTYPath=/dev/tty1